5625 Commits

Author	SHA1	Message	Date
Daniel Walsh	ec3ce7315e	Merge pull request #3646 from ybw0014/chore/drop-low-version ... Drop support for 1.14, 1.15	2023-01-22 11:28:17 +00:00
Daniel Walsh	fce192b45f	Merge pull request #3706 from ybw0014/fix/nested-itemgroup ... Resolves https://github.com/Slimefun/Slimefun4/issues/3705	2023-01-05 19:59:39 +00:00
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
ybw0014	888e26d5ad	Extra empty line	2022-10-22 19:48:38 -04:00
ybw0014	893612144b	Reorganize import	2022-10-22 19:42:23 -04:00
ybw0014	32774bbd5c	Add document	2022-10-22 19:21:52 -04:00
ybw0014	e78d89ad14	Empty SubItemGroup should not be visible in NestedItemGroup	2022-10-22 19:18:12 -04:00
ybw0014	8d72b90add	Merged upstream	2022-10-19 19:36:21 -04:00
ybw0014	48d67d49c5	Merge remote-tracking branch 'upstream/master' into chore/drop-low-version	2022-10-19 19:34:38 -04:00
ybw0014	281d1e7632	Fix test	2022-10-18 13:33:49 -04:00
ybw0014	bbf39f6a69	Remove SlimefunUtils.isInventoryEmpty	2022-10-18 13:32:14 -04:00
ybw0014	f1ab7ecd4e	Remove WorldUtils	2022-10-18 13:29:24 -04: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
ybw0014	030b7ff5c4	Merge remote-tracking branch 'upstream/master' into chore/drop-low-version ... # Conflicts: # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/setup/SlimefunItemSetup.java	2022-09-29 12:13:42 -04: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
ybw0014	076c55c696	Remove unused imports	2022-08-07 22:41:56 -04:00
ybw0014	aa79e640e8	Change GEO resource versions	2022-08-07 20:59:54 -04:00
ybw0014	fd74586e23	Remove unused imports	2022-08-07 20:58:25 -04:00
ybw0014	af897d5df7	Fix test	2022-08-07 18:41:23 -04:00
ybw0014	435f09b6b1	Remove more version specific stuff	2022-08-07 17:46:28 -04:00
ybw0014	eb5d4ca3f7	Fix test compile	2022-08-07 16:54:18 -04:00
ybw0014	dcc13a8f9a	Remove 1.14 & 1.15 from MinecraftVersion	2022-08-07 16:41:36 -04:00
ybw0014	5cd5f26c91	Drop support for 1.14 and 1.15	2022-08-07 16:15:17 -04: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