mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity
2,249 Commits 1 Branch 0 Tags 64 MiB
c639595637
Commit Graph

2249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TheBusyBiscuit
f74c078f61
Merge pull request #1293 from NihilistBrew/patch-1 
Grind andesite, granite, diorite to gravel
 2019-12-10 11:26:57 +01:00
TheBusyBiscuit
fd8a77dd79
Merge pull request #1288 from ramdon-person/patch-1 
Added Soulbound Trident
 2019-12-10 11:26:44 +01:00
TheBusyBiscuit
cdef18c8d7 [CI skip] Little improvement 2019-12-10 11:21:09 +01:00
TheBusyBiscuit
4c593760ba [CI skip] Some minor changes to metrics 2019-12-10 11:10:53 +01:00
TheBusyBiscuit
c8cc7818b2 [CI skip] Added two more contributor names, some refactoring 2019-12-10 11:00:04 +01:00
SoSeDiK
ac80575d8f Optimized item check 2019-12-10 09:55:56 +02:00
ramdon_person
052f80eeac
Update SlimefunSetup.java 2019-12-09 23:24:51 -08:00
BurningBrimstone
c879e5ebb7
Updated Quartz Namespace ID 
Changed NETHER_QUARTZ to QUARTZ.
 2019-12-09 13:19:09 -05:00
BurningBrimstone
60f16ee4ac
Added recipes 
Added recipes for iron and gold nuggets into their respective ingots. Also added a recipe for quartz into quartz blocks.

https://discordapp.com/channels/565557184348422174/627048923122499584/652563773793763343
 2019-12-09 12:40:51 -05:00
NihilistBrew
3d8add777a
Grind andesite, granite, diorite to gravel 
From https://discordapp.com/channels/565557184348422174/565569155848208404/650406015246008339
 2019-12-09 16:50:25 +01:00
TheBusyBiscuit
a5e80923c1
[CI skip] Yet another test 2019-12-09 10:30:21 +01:00
TheBusyBiscuit
a82df4f9bd
[CI skip] Another test 2019-12-09 10:26:40 +01:00
TheBusyBiscuit
6c4c9cdc17 Some minor optimization 2019-12-09 09:52:49 +01:00
SoSeDiK
f0d04c75d8 Removed unnecessary action 2019-12-08 23:12:11 +02:00
SoSeDiK
27a8aa6236 Tweaked instant researching 
Don't start researching when it's instant, just throw fireworks & message about completion
 2019-12-08 22:55:17 +02:00
SoSeDiK
ce5ca5146e Reworked Knowledge Tome 2019-12-08 22:45:03 +02:00
TheBusyBiscuit
60e7f8dc1d
[CI skip] Finally 2019-12-08 20:58:43 +01:00
TheBusyBiscuit
b0aadc3878
[CI skip] Now it should work 2019-12-08 20:57:21 +01:00
TheBusyBiscuit
1a1cfd4857
[Ci skip] Minor change 2019-12-08 20:53:24 +01:00
TheBusyBiscuit
99177771dd
[CI skip] GitHub is weird. 2019-12-08 20:51:10 +01:00
TheBusyBiscuit
498385d8b5
[CI skip] Updated branch-cat 2019-12-08 20:34:33 +01:00
TheBusyBiscuit
e624d44c77
[CI skip] Forgot a bracket 2019-12-08 20:12:22 +01:00
TheBusyBiscuit
b84646a5d3
[CI skip] Fixed credentials 2019-12-08 20:11:13 +01:00
TheBusyBiscuit
e3d42ad241
[CI skip] Another test 2019-12-08 20:08:33 +01:00
TheBusyBiscuit
cc8dbd0e49
[CI skip] Fixed branch-cat 2019-12-08 20:03:31 +01:00
TheBusyBiscuit
71e261f44d
[CI skip] Updated workflow 2019-12-08 19:54:07 +01:00
TheBusyBiscuit
70c937f351
[CI skip] Testing out branch-cat 2019-12-08 19:51:51 +01:00
TheBusyBiscuit
afdff3063a
Merge pull request #1291 from SoSeDiK/gs 
Fixed duplicate Grind Stone recipes
 2019-12-08 17:08:45 +01:00
SoSeDiK
912d2e9d7f
Fixed duplicate Grind Stone recipes 2019-12-08 17:44:02 +02:00
TheBusyBiscuit
34fc70698a
Merge pull request #1290 from SoSeDiK/crucible 
Updated Crucible's mechanics
 2019-12-08 14:54:15 +01:00
SoSeDiK
9b5bcfde44 Updated Crucible's mechanics 2019-12-08 15:24:22 +02:00
TheBusyBiscuit
ec44688459 Improved SlimefunItemStack#clone() 2019-12-08 13:09:15 +01:00
TheBusyBiscuit
8e72577974 Another optimization 2019-12-08 13:03:01 +01:00
TheBusyBiscuit
021bb3cbc8 Item optimizations 2019-12-08 12:59:55 +01:00
TheBusyBiscuit
39082938a8 Optimized items even further 2019-12-08 12:58:50 +01:00
TheBusyBiscuit
a22068b9ff Optimized SlimefunManager.isItemSimilar 2019-12-08 12:58:05 +01:00
TheBusyBiscuit
2075c103cd Updated CS-CoreLib2 2019-12-08 12:31:13 +01:00
TheBusyBiscuit
4699d6b94d [Ci skip] Another little change 2019-12-08 10:48:41 +01:00
TheBusyBiscuit
d12253c2f2 [Ci skip] Some small changes 2019-12-08 10:07:51 +01:00
TheBusyBiscuit
e5da69eb30
Merge pull request #1287 from WalshyDev/fix/contributors 
Allow for different GH and MC names + small improvements
 2019-12-08 09:31:06 +01:00
ramdon_person
17cf8cecdc
Update ResearchSetup.java 2019-12-07 12:30:38 -08:00
ramdon_person
c48cf894d4
Update SlimefunSetup.java 2019-12-07 11:56:11 -08:00
coder4321
4b8c948ad6
Update SlimefunSetup.java 2019-12-07 10:11:16 -08:00
coder4321
2281393a8b
Update SlimefunSetup.java 2019-12-07 10:09:50 -08:00
Daniel Walsh
f1ee2bd092 Added @NihilistBrew 2019-12-07 12:59:56 +00:00
coder4321
05f2751d58
Added Soulbound Trident 2019-12-07 01:25:34 -08:00
TheBusyBiscuit
72916b3e4f Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-12-07 10:05:11 +01:00
TheBusyBiscuit
f25bf75d67 Added Nether Gold Pan to the Electric Gold Pan 2019-12-07 10:04:54 +01:00
coder4321
f90f1c609f [CI skip] Updated Teleport Sounds and Fixed The “color codes are supported text” for elevators (#1283) 
* Update TeleportationSequence.java

* Update TeleportationSequence.java

* Update Elevator.java
 2019-12-07 09:41:26 +01:00
Daniel Walsh
cafc78b3fe Revert 5b9e9a4fb7 2019-12-06 21:47:18 +00:00