1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Commit Graph

5605 Commits

Author SHA1 Message Date
Daniel Walsh
1272148191
Merge pull request #3725 from ybw0014/chores/cscorelib
Disable Slimefun when CS-CoreLib is installed
2023-01-05 02:34:17 +00:00
justtos
7d5c31c285
Update to a better disabled check
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2023-01-04 23:11:39 +02:00
justtos
168484e4ea
[Fix] BlockPlacer placing disabled items 2023-01-03 17:58:43 +02:00
ybw0014
a0682fe49c
Change warning message 2022-12-14 14:40:59 -05:00
ybw0014
95b628d8c9
Change warning message 2022-12-14 14:39:55 -05:00
ybw0014
fc9071500a
No more CS-CoreLib 2022-12-14 03:08:38 -05:00
TheBusyBiscuit
0b7c656d86 Improved logging for issue #3699 2022-10-18 15:42:39 +02:00
TheBusyBiscuit
27847a6396 Fixed #3664 (again, I hope) 2022-10-18 15:24:58 +02:00
TheBusyBiscuit
7b9d769bab
Merge pull request #3678 from J3fftw1/fix-3577
fixed 3677
2022-10-04 10:47:03 +02:00
Jeffrey Kosse
61f549260f forgot to change json name 2022-10-01 19:10:27 +02:00
Jeffrey Kosse
64c8dd571a changed tag name 2022-10-01 19:04:09 +02:00
Jeffrey Kosse
b516e69e5c added mangrove tag 2022-09-30 21:58:40 +02:00
Jeffrey Kosse
501c7ba85a whoops 2022-09-30 20:56:13 +02:00
Jeffrey Kosse
317a92bd69 fix 3577 2022-09-30 20:54:33 +02:00
TheBusyBiscuit
5455fb08ec
Merge pull request #3594 from TheWireLord/master
Added Glow Berries Being Useful
2022-09-29 17:59:02 +02:00
TheWireLord
9f01ec03b3
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/generators/BioGenerator.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2022-09-29 08:02:51 -04:00
TheBusyBiscuit
fd00771222
Merge pull request #3363 from qwertyuioplkjhgfd/register-filled-flask
Register filled flask as a Slimefun Item
2022-09-29 13:50:54 +02:00
TheBusyBiscuit
62c7324e6d
Merge pull request #3500 from J3fftw1/feature/freezer-3
added freezer 3
2022-09-29 13:38:55 +02:00
TheBusyBiscuit
636008dcb3 Removed research for the Hercules Pickaxe 2022-09-29 13:38:41 +02:00
TheBusyBiscuit
73db0212d9 Fixed #3651 2022-09-29 13:05:16 +02:00
TheBusyBiscuit
f9f3b3ddf9 Resolved #3455 and removed the Hercules Pickaxe 2022-09-29 13:04:31 +02:00
TheBusyBiscuit
497a4af1c5 Fixed #3664 2022-09-29 12:39:40 +02:00
TheBusyBiscuit
1dcc4bdd3f
Merge pull request #3652 from Speebr0/master
"Fixing" Dust Order
2022-09-19 03:04:17 +02:00
The Busy Bot
5af46611a2
[CI skip] New locale updates from Crowdin 2022-09-18 14:17:52 +02:00
The Busy Bot
0b6a81aa4d
[CI skip] New locale updates from Crowdin 2022-08-13 19:29:15 +02:00
Speebr0
c71722a3ff
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java
Dunno what it actually does, seems to remove empty space in line 534

Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
2022-08-12 16:03:40 -07:00
Speebr0
70cfb0dea1
"Fixing" Dust Order
Literally just put the silver dust before the lead dust, just like the silver ingot is before the lead ingot in the guide, a dumb, small issue that was bugging me.
2022-08-12 02:05:53 -07:00
The Busy Bot
b1aae439f3
[CI skip] New locale updates from Crowdin 2022-08-08 21:12:50 +02:00
JustAHuman-xD
178fb5cead Remove "Burst" & "Custom" from Lore
Removes the "Burst" and "Custom" Lore Lines from the ColoredFireworkStar Class.

Sub sequentially removing it from all Runes & More
2022-08-06 20:04:10 -05:00
The Busy Bot
961a77f180
[CI skip] New locale updates from Crowdin 2022-07-25 13:31:22 +02:00
The Busy Bot
944d648e4b
[CI skip] New locale updates from Crowdin 2022-07-23 11:00:04 +02:00
The Busy Bot
2604e93c89
[CI skip] New locale updates from Crowdin 2022-07-21 01:21:44 +02:00
TheBusyBiscuit
85e8fe8187 hotfix 2022-07-19 19:49:48 +02:00
TheBusyBiscuit
aa74958837 Added several new strings for translation
* Cargo node connector messages now also show up in the actionbar!

* /sf stats and /sf researching can no longer be used if researching is
disabled.

* If researching is disabled the guide will no longer contain settings
for research-related options
2022-07-19 19:47:30 +02:00
TheBusyBiscuit
5d5decbf45
Merge pull request #3602 from Slimefun/java16
Update to Java 16
2022-07-19 15:09:27 +02:00
TheBusyBiscuit
9e202e958c Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2022-07-19 15:07:08 +02:00
TheBusyBiscuit
84806732ef Slimefun can now be translated into lithuanian and sinhala 2022-07-19 15:05:34 +02:00
TheBusyBiscuit
bca22ded8b
Merge pull request #3620 from J3fftw1/feature/drying-mud
added a way to turn mud into clay
2022-07-19 12:55:11 +02:00
Jeffrey Kosse
02a8537686 unused import 2022-07-18 21:32:51 +02:00
Jeffrey Kosse
2281ae7ba5 added a way to turn mud into clay 2022-07-18 21:31:42 +02:00
The Busy Bot
4172138bb0
[CI skip] New locale updates from Crowdin 2022-07-16 20:06:58 +02:00
TheBusyBiscuit
6d141373fb
Merge branch 'master' into java16 2022-07-14 14:04:57 +02:00
TheBusyBiscuit
6da39afab7 Made the Tree Growth Accelerator 200% better 2022-07-14 13:09:49 +02:00
The Busy Bot
616f6a8cf1
[CI skip] New locale updates from Crowdin 2022-07-12 12:15:54 +02:00
The Busy Bot
126d5ba69d
[CI skip] New locale updates from Crowdin 2022-07-11 01:13:21 +02:00
TheBusyBiscuit
5dbe617205
Merge pull request #3277 from KyleEstein/legacy-gold-pan
Allow admins to control the behavior of the Electric Gold Pan via the…
2022-07-10 14:56:21 +02:00
TheBusyBiscuit
d191599391
Merge pull request #3608 from Sefiraat/feature/itemgroup_sharing
Allow addons to disable warning
2022-07-10 13:22:05 +02:00
TheBusyBiscuit
42aed25059
Merge pull request #3473 from qwertyuioplkjhgfd/better-round-robin
Improve Round-Robin Accuracy
2022-07-10 13:20:00 +02:00
TheBusyBiscuit
43bc65c94c
[CI skip] Mark persian as a "right-to-left" lang 2022-07-10 12:53:31 +02:00
The Busy Bot
e3c6a7ecc0
[CI skip] New locale updates from Crowdin 2022-07-10 12:49:24 +02:00