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,121 Commits 1 Branch 0 Tags 64 MiB
2c90117b34
Commit Graph

2121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
a29016a391
[CI skip] Added more wiki entries 2019-12-06 14:41:01 +01: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
TheBusyBiscuit
95e70e5838
Merge pull request #1282 from SoSeDiK/mf 
Fixes #1281
 2019-12-04 18:20:46 +01:00
SoSeDiK
a294e0db1f
Fixes #1281 2019-12-04 17:57:38 +02:00
TheBusyBiscuit
ac8d91810b
[CI skip] Merge pull request #1279 from SoSeDiK/hb 
Added a new constructor for HandledBlock
 2019-12-04 12:42:51 +01: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
TheBusyBiscuit
ae2a75b1d1
[CI skip] Merge pull request #1263 from poma123/patch-1 
AndroidMineEvent
 2019-12-03 00:37:23 +01:00
TheBusyBiscuit
df9315dd48
Merge pull request #1278 from J3fftw1/fix/fixes-actually-actually-fixes 
fixes dupe with geominer
 2019-12-02 23:20:22 +01:00
J3fftw1
c2230f1763 fixes dupe with geominer 2019-12-02 23:14:22 +01:00
poma123
1ddd46768e Changed android getter & updated javadocs 2019-12-02 16:21:55 +01:00
TheBusyBiscuit
23d513943f
Merge pull request #1277 from J3fftw1/fix/fixes-1276 
actually fixes it now
 2019-12-02 16:01:50 +01:00
J3fftw1
5e52a5d3ab actually fixes it now 
removed if (list.size() % 2 != 0) list.add(null);
 2019-12-02 15:58:33 +01:00
poma123
426dd64a2b Added android getter and some javadocs 2019-12-02 15:15:48 +01:00
TheBusyBiscuit
8183a1a5af Fixes #1269 2019-12-01 20:55:46 +01:00
TheBusyBiscuit
958a3c0429 Fixed IllegalArgumentException for second-page credits 2019-12-01 19:22:23 +01:00
TheBusyBiscuit
2c64adc536 [CI skip] Minor UI change 2019-12-01 19:18:02 +01:00
TheBusyBiscuit
4ffc2888fd Fixed credits now showing everyone 2019-12-01 19:16:27 +01:00
TheBusyBiscuit
78df2e3ea5 Added Electric Press 2019-12-01 19:08:32 +01:00
TheBusyBiscuit
15d1d708f6 Fixed guide showing incomplete recipes for some machines 2019-12-01 18:59:14 +01:00