1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-21 04:05:48 +00:00
Commit Graph

234 Commits

Author SHA1 Message Date
Muhammad Kamal
9d246adf93 Reformat Code 2020-01-03 14:04:43 +02:00
Muhammad Kamal
f8c2983491 Enable Automated Crafting Chamber To Craft Last Shaped Recipe 2020-01-01 00:02:47 +02:00
TheBusyBiscuit
3773460561 Fixes #1337 2019-12-30 01:25:05 +01:00
TheBusyBiscuit
e90b8c18f7 [CI skip] Reduced technical debt 2019-12-30 01:21:47 +01:00
TheBusyBiscuit
b74479327a [CI skip] Reduced technical debt 2019-12-30 01:18:09 +01:00
TheBusyBiscuit
1c0e36f6f1 [CI skip] Optimized and refactored some android code 2019-12-30 01:01:09 +01:00
TheBusyBiscuit
a817903a04 [CI skip] Updated dependencies 2019-12-29 22:13:00 +01:00
TheBusyBiscuit
b8a94e22e5 [CI skip] Some refactoring 2019-12-29 18:30:48 +01:00
TheBusyBiscuit
e2d58f7f50 Several changes, won't list em all 2019-12-29 14:14:51 +01:00
TheBusyBiscuit
39292ae9ce Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-12-28 12:43:01 +01:00
TheBusyBiscuit
784ad0b195 Fixes #1295 2019-12-28 12:42:39 +01:00
AlexLander123
586437b16d Fix Basic Circuit Board not dropping 2019-12-28 14:35:39 +08:00
TheBusyBiscuit
9a3d79781b [CI skip] Reduced technical debt 2019-12-27 11:38:54 +01:00
TheBusyBiscuit
687e97f8e9 Minecraft recipe will now scroll through all available items (e.g. wood) 2019-12-27 11:10:22 +01:00
TheBusyBiscuit
2a06c2e215 Slimefun Guide now shows ALL minecraft recipes, with pages 2019-12-27 02:16:01 +01:00
TheBusyBiscuit
3a19350323 Added Kelp Cookies (because why not?) 2019-12-26 21:26:04 +01:00
TheBusyBiscuit
336b26759a [CI skip] Some minor changes 2019-12-26 21:10:03 +01:00
TheBusyBiscuit
f7bfff2f37 Players can now toggle their research-fireworks in the guide 2019-12-26 21:01:51 +01:00
TheBusyBiscuit
b7776e73b4 Minor performance improvement 2019-12-26 20:29:20 +01:00
TheBusyBiscuit
5933bc6367 Reduced technical debt 2019-12-26 19:56:58 +01:00
TheBusyBiscuit
249af4001b Fixes #1325 2019-12-26 19:49:53 +01:00
TheBusyBiscuit
7183350e1a Some code cleanup 2019-12-26 18:36:21 +01:00
TheBusyBiscuit
0efc51c7ea Fixed Category constructor 2019-12-26 18:30:40 +01:00
TheBusyBiscuit
129b98dff6 Lots of refactoring, implemented a suggestion 2019-12-23 20:38:55 +01:00
TheBusyBiscuit
bd610a9f94 Fixes #1298 2019-12-23 19:39:35 +01:00
TheBusyBiscuit
b5dd2f329a [CI skip] Reduced technical debt, lots of refactoring 2019-12-22 23:00:05 +01:00
TheBusyBiscuit
997c682a00 Refactoring + Allowed custom models for UI elements 2019-12-22 14:00:35 +01:00
coco0325
2ceb9d6d45 Update OilPump.java 2019-12-22 17:08:44 +08:00
coco0325
4d63bffc72 Update OilPump.java 2019-12-22 15:31:53 +08:00
coco0325
87b8035b34 Corrected OliPump.java 2019-12-22 01:46:56 +08:00
coco0325
ff0016ad0e Update OilPump.java 2019-12-22 01:32:20 +08:00
coco0325
2fd2dae403 Revert "TW-1"
This reverts commit 687516cfae.
2019-12-22 01:18:12 +08:00
coco0325
7d0d222f79 Update OilPump.java 2019-12-22 01:16:43 +08:00
coco0325
060051623d Merge remote-tracking branch 'upstream/master' 2019-12-22 01:08:49 +08:00
coco0325
687516cfae TW-1 2019-12-22 01:07:58 +08:00
TheBusyBiscuit
bee2375757 Removed Nether Drill (+ some micro-optimizations) 2019-12-21 16:46:17 +01:00
TheBusyBiscuit
429c280095 Fixes #1316 2019-12-21 15:42:07 +01:00
TheBusyBiscuit
a89b9ff467 [CI skip] Fine, I'll do it myself, Thanos said 2019-12-19 23:26:40 +01:00
TheBusyBiscuit
97d72e0a8d
[CI skip] Merge pull request #1294 from BurningBrimstone/master
Added recipes
2019-12-19 23:25:03 +01:00
TheBusyBiscuit
f9b12dfed5 [CI skip] Improved Cargo Performance a lot (breaks Barrels though) 2019-12-19 23:22:09 +01:00
TheBusyBiscuit
f7fa6e2972 [CI skip] Reduced technical debt and tweaked Magnesium Salt 2019-12-18 01:07:04 +01:00
TheBusyBiscuit
331b9b64a7
[CI skip] Merge pull request #1310 from J3fftw1/feature/gravel-to-sand
added a way to automate sand production
2019-12-17 23:08:19 +01:00
J3fftw1
b1ae5c9047 added a way to automate sand production 2019-12-17 23:03:56 +01:00
TheBusyBiscuit
33adb7e79a Added Magnesium Salt and Magnesium-powered Generator 2019-12-17 01:37:09 +01:00
TheBusyBiscuit
59fb83e871 [CI skip] Removed CS-CoreLib Auto-Installer and reduced technical debt 2019-12-17 00:44:41 +01:00
TheBusyBiscuit
5730907da3
Merge pull request #1308 from creator3/master
Fix drops in 1.15
2019-12-17 00:19:10 +01:00
TheBusyBiscuit
989ed45a02 Added Salt to the GEO Miner (and reduced technical debt) 2019-12-17 00:18:04 +01:00
creator3
d698840e1f Use the actual tool item in calls to getDrops() 2019-12-16 11:47:47 -05:00
creator3
8b177df6c8 Fix drops in 1.15 2019-12-16 11:21:31 -05:00
TheBusyBiscuit
7268fb0505 [CI skip] Some more refactoring 2019-12-12 02:52:24 +01:00