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
1,757 Commits 1 Branch 0 Tags 64 MiB
a91d926698
Commit Graph

179 Commits

Author SHA1 Message Date
TheBusyBiscuit
a91d926698 Re-formatted pom.xml 2019-12-12 00:20:01 +01:00
TheBusyBiscuit
db5f10ffe8 Fixed Credits + Reduced technical debt 2019-12-12 00:16:28 +01:00
TheBusyBiscuit
d66d34e85b
Merge branch 'master' into support/1.15 2019-12-11 23:15:33 +01:00
TheBusyBiscuit
3976e427a0 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-12-11 23:14:25 +01:00
TheBusyBiscuit
1ee411e4ca [CI skip] Reduced and Increased technical debt 2019-12-11 23:13:51 +01:00
Daniel Walsh
32be167679 Support 1.15 2019-12-11 16:41:00 +00:00
TheBusyBiscuit
460270f2a9
Merge pull request #1292 from SoSeDiK/kt 
Reworked & Fixed Knowledge Tome and a minor researching tweak
 2019-12-10 11:27:33 +01:00
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
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
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
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
SoSeDiK
912d2e9d7f
Fixed duplicate Grind Stone recipes 2019-12-08 17:44:02 +02: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
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
Daniel Walsh
5b9e9a4fb7 *screams internally* 2019-12-06 21:45:06 +00:00
Daniel Walsh
9156d478ef Add ajan-12 and LinoxGH 2019-12-06 21:35:17 +00:00
Daniel Walsh
3f179f9eaa oops, revert dis 2019-12-06 21:03:56 +00:00
Daniel Walsh
724c550204 Pasting is a true gem 2019-12-06 20:57:17 +00:00
Daniel Walsh
73a9eddf7f Fixed up 
Now doesn't accept special chars and added imgbot
 2019-12-06 20:56:03 +00:00
Daniel Walsh
a112e43b42 Allow for different GH and MC names + small improvements 2019-12-06 20:08:20 +00:00
TheBusyBiscuit
bcbe16253e Search now shows the Category of an Item 2019-12-06 14:20:42 +01:00
TheBusyBiscuit
43033ec3a4
Fixes #1280 2019-12-06 08:39:43 +01:00
SoSeDiK
a294e0db1f
Fixes #1281 2019-12-04 17:57:38 +02:00
SoSeDiK
732ae5e0dc
Added a new constructor 
Allows using the new item system.
 2019-12-04 13:35:08 +02:00
TheBusyBiscuit
da1dd294f6 Fixed Output Chest 2019-12-04 00:04:34 +01:00
TheBusyBiscuit
0fd7892ca4 Fixed blocks turning into CSCoreLib heads for all newly placed 
non-ticking blocks.
 2019-12-03 20:20:33 +01:00