1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Commit Graph

2022 Commits

Author SHA1 Message Date
TheBusyBiscuit
baa6f9eb66 [CI skip] Updated Change Log 2019-12-26 23:52:00 +01:00
TheBusyBiscuit
15e2e04a11 Updated dependencies 2019-12-26 23:37:27 +01:00
TheBusyBiscuit
5dc19aedc3 [CI skip] Excluded github-actions from the contributors list 2019-12-26 23:30:28 +01:00
TheBusyBiscuit
745b6f7a28
[CI skip] Updated workflow 2019-12-26 23:29:24 +01:00
github-actions[bot]
e4c9585a14 docs: Update TOC 2019-12-26 22:27:05 +00:00
TheBusyBiscuit
9cabf73294
[Ci skip] Added TOC Generator 2019-12-26 23:26:37 +01:00
TheBusyBiscuit
d96f9c9311
[CI skip] Test 2019-12-26 23:23:44 +01:00
TheBusyBiscuit
924cd399f9
[CI skip] Created change log 2019-12-26 23:19:42 +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
d2ac50be38 Overhauled Guide Settings 2019-12-26 20:52:15 +01:00
TheBusyBiscuit
b7776e73b4 Minor performance improvement 2019-12-26 20:29:20 +01:00
TheBusyBiscuit
4efb53b705 Minor changes 2019-12-26 20:22:28 +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
0e0859e73a [CI skip] Another minecraft alias 2019-12-23 00:39:03 +01:00
TheBusyBiscuit
2edf5db140 [CI skip] Added bverhoevens and BurningBrimstones minecraft alias 2019-12-22 23:51:43 +01:00
TheBusyBiscuit
b5dd2f329a [CI skip] Reduced technical debt, lots of refactoring 2019-12-22 23:00:05 +01:00
TheBusyBiscuit
5a0b994a4f Fixes #1318 2019-12-22 14:03:52 +01:00
TheBusyBiscuit
997c682a00 Refactoring + Allowed custom models for UI elements 2019-12-22 14:00:35 +01:00
TheBusyBiscuit
fbcc7c4bfa
Merge pull request #1317 from coco0325/dev
Oil Pump Optimization
2019-12-22 10:16:00 +01:00
coco0325
2ceb9d6d45 Update OilPump.java 2019-12-22 17:08:44 +08:00
TheBusyBiscuit
29ef07d1e7
[CI skip] Updated Bot once more 2019-12-22 10:08:01 +01:00
TheBusyBiscuit
b24a13440c
[Ci skip] Updated Bot again 2019-12-22 10:06:21 +01:00
TheBusyBiscuit
fbfd874b13
[Ci skip] Updated Bot 2019-12-22 10:05:15 +01: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
c1ba8c02b3 Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 2019-12-21 15:42:29 +01:00
TheBusyBiscuit
429c280095 Fixes #1316 2019-12-21 15:42:07 +01:00
TheBusyBiscuit
6ef858a6ee
[CI skip] Merge pull request #1312 from pentabulge/master
Added more wiki entries
2019-12-19 23:42:45 +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
penta
f9ef602982 Added more wiki entries 2019-12-18 19:40:03 +01:00
penta
e41b2762f0
Merge pull request #2 from TheBusyBiscuit/master
Sync
2019-12-18 13:31:42 +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