5605 Commits

Author	SHA1	Message	Date
TheBusyBiscuit	7274436ca1	Deprecated the "Hercules Pickaxe"	2022-07-10 11:11:15 +02:00
TheBusyBiscuit	2813e76075	Fixed #3573	2022-07-10 10:59:23 +02:00
TheBusyBiscuit	5200823b4e	Merge branch 'master' into java16	2022-07-09 21:07:18 +02:00
TheBusyBiscuit	1948858ccd	Merge pull request #3503 from J3fftw1/fix/bee-wings ... Fix bee wings erroring on startup	2022-07-09 21:00:53 +02:00
TheBusyBiscuit	bcc606cb9d	Merge pull request #3607 from J3fftw1/feature/wool_carpets_tag ... added wool tag	2022-07-09 20:44:39 +02:00
TheBusyBiscuit	1851332222	Merge pull request #3492 from J3fftw1/feature/new-glass ... added tinted glass	2022-07-09 20:44:30 +02:00
Sefiraat	6be38d68ca	Update src/main/java/io/github/thebusybiscuit/slimefun4/api/items/ItemGroup.java ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2022-07-09 20:19:28 +02:00
Sefiraat	eaa806d079	Feedback	2022-07-08 22:06:02 +01:00
Sefiraat	be7e4edff3	Docs	2022-07-06 12:24:59 +01:00
Sefiraat	1d74866863	Allow addons to disable warning	2022-07-06 12:16:33 +01:00
Jeffrey Kosse	2f2f031b8e	forget the #	2022-07-06 11:55:25 +02:00
Jeffrey Kosse	5ab92f4111	moved the tag to be with other slimefun tags	2022-07-06 11:43:51 +02:00
Jeffrey Kosse	f516144ab6	added wool tag	2022-07-06 11:40:08 +02:00
J3fftw	5414c284fa	Update src/main/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/MultiBlock.java ... Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>	2022-07-03 23:04:37 +02:00
TheBusyBiscuit	06bd9873d9	Cleaned up some more code smells	2022-07-03 12:21:49 +02:00
Sefiraat	82e141cf09	Cookie is making me work for my lunch	2022-07-03 10:36:12 +01:00
Sefiraat	affa3af06c	Merge remote-tracking branch 'origin/java16' into java16	2022-07-02 23:46:09 +01:00
Sefiraat	5f525fbf74	Java16 Sonar Changes - 8 (done again)	2022-07-02 23:44:39 +01:00
Sefiraat	809530fccd	Apply suggestions from code review - 2	2022-07-02 23:39:53 +01:00
Sefiraat	d15e02afbc	Merge remote-tracking branch 'upstream/java16' into java16 ... # Conflicts: # src/main/java/io/github/thebusybiscuit/slimefun4/api/items/SlimefunItem.java	2022-07-02 23:39:38 +01:00
Sefiraat	58fde5cbdf	Apply suggestions from code review - 1 ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2022-07-02 23:39:05 +01:00
TheBusyBiscuit	e80f137a79	Merge branch 'java16' into java16	2022-07-03 00:00:07 +02:00
Sefiraat	30e9c879e0	Java16 Sonar Changes - 7 (done)	2022-07-02 22:09:05 +01:00
Sefiraat	dbf55be230	Java16 Sonar Changes - 6	2022-07-02 21:51:08 +01:00
Sefiraat	75375cef45	Remove CT from classifyLocation()	2022-07-02 21:37:15 +01:00
Sefiraat	9f4cb828cb	Java16 Sonar Changes - 5	2022-07-02 21:36:15 +01:00
Sefiraat	0f6b6b244c	Java16 Sonar Changes - 4	2022-07-02 21:31:03 +01:00
Sefiraat	cd9920b181	Java16 Sonar Changes - 3	2022-07-02 21:13:50 +01:00
Sefiraat	f32dfa4d76	Java16 Sonar Changes - 2	2022-07-02 21:03:20 +01:00
Sefiraat	b4bd9d7acf	Java16 Sonar Changes	2022-07-02 20:51:14 +01:00
TheBusyBiscuit	bb9e2dfa4a	Impelemented a few instanceof patterns, actually quite nice :)	2022-07-02 21:43:16 +02:00
TheBusyBiscuit	20c3564e8f	Initial update to Java 16	2022-07-02 20:49:00 +02:00
JasperChaseTOQ	ad3030c39c	Update src/main/resources/tags/dirt_variants.json ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2022-06-23 18:32:20 -04:00
JasperChaseTOQ	68739d87a1	Update dirt_variants.json	2022-06-22 22:33:51 -04:00
TheWireLord	583d69ea78	Added Glow Berries Being Useful ... + Added Glow Berry Juice as a result of using Glow Berries in the Juicer. + Added Glow Berries as a fuel in the Bio Reactor. + Updated Wiki.	2022-06-17 16:29:25 -04:00
JasperChaseTOQ	bff4ca91c0	Update SlimefunItems.java	2022-06-11 20:52:28 -04:00
TheBusyBiscuit	c05420565d	Added test cases for 1.19 biome maps	2022-06-11 13:07:17 +02:00
TheBusyBiscuit	cea6980368	Fixed biome-map for 1.19	2022-06-11 13:07:07 +02:00
Jeffrey Kosse	f8b44cb63f	removed illegal values	2022-06-07 22:17:55 +02:00
Jeffrey Kosse	eb8fa9c522	fixed tests	2022-06-07 22:07:52 +02:00
Jeffrey Kosse	fb5a20c603	updated to 1.19	2022-06-07 21:55:18 +02:00
TheBusyBiscuit	f431aa6dca	Merge pull request #3427 from Slimefun/chore/yeet-chestterminal ... Removed ChestTerminal support	2022-04-29 12:26:40 +02:00
TheBusyBiscuit	949eb48fbc	[CI skip] Removed CT as a loadbefore	2022-04-29 12:26:20 +02:00
TheBusyBiscuit	5cfc4f725e	Fixed #3548	2022-04-25 18:12:02 +02:00
TheBusyBiscuit	7a2347a027	Merge pull request #3546 from craftish37/master ... Added Seagrass recipe (suggestion #398 from Mr.Moules)	2022-04-24 19:26:23 +02:00
craftish37	76444df8f5	Formatting ... Co-authored-by: Varian Anora <variananora@outlook.com>	2022-04-22 16:31:27 +02:00
craftish37	1a5c3f024f	Forgot to use my damn brain ... (Also added Seagrass Fertilizer)	2022-04-22 16:02:21 +02:00
craftish37	3021a8efa9	Added Seagrass recipe (suggestion #398 from Mr.Moules)	2022-04-22 15:19:38 +02:00
itslukemango	7f70570260	Update src/main/java/io/github/thebusybiscuit/slimefun4/core/machines/MachineProcessor.java ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2022-04-22 12:11:27 +01:00
=	ec79423123	Fix Arithmetic Error	2022-04-20 22:45:04 +01:00
TheBusyBiscuit	217196c137	Fixed #3534	2022-04-19 20:51:13 +02:00
TheBusyBiscuit	429ff50624	Fixed #3504	2022-04-08 18:02:45 +02:00
Jeffrey Kosse	30386fbcb5	did requested changes	2022-04-05 19:34:06 +02:00
Jeffrey Kosse	15dce08769	fixed error on startup	2022-03-22 07:35:13 +01:00
TheBusyBiscuit	020094e04e	Fixed unit tests	2022-03-20 11:38:20 +01:00
TheBusyBiscuit	d3cf518f74	Refactored ItemGroups	2022-03-20 11:21:27 +01:00
Jeffrey Kosse	8043261da7	added freezer 3	2022-03-19 17:44:58 +01:00
qwertyuioplkjhgfd	d2d4dd54d5	comments and fix a mistake	2022-03-15 22:47:29 -07:00
haiman	d31275c9ca	Update ColoredMaterial.java	2022-03-16 07:41:05 +08:00
haiman	51bcf3d8b9	Update ColoredMaterial.java	2022-03-15 21:50:44 +08:00
TheBusyBiscuit	114de62942	Fixed #3445	2022-03-14 18:44:48 +01:00
TheBusyBiscuit	495208a089	[CI skip] Updated changelog	2022-03-14 18:19:48 +01:00
Jeffrey Kosse	615e15b06c	added tinted glass	2022-03-14 09:24:39 +01:00
ybw0014	e818597b0b	Add shulker box to ColoredMaterial	2022-03-12 16:36:22 -05:00
TheBusyBiscuit	357fee7fff	Merge pull request #3453 from FN-FAL113/fix/industrialminer-bug ... Fixes #3336	2022-03-11 12:14:58 +01:00
TheBusyBiscuit	cea7204994	Fixed #3487	2022-03-10 21:00:28 +01:00
TheBusyBiscuit	c88b43717c	[CI skip] Merge pull request #3479 from FN-FAL113/fix/pedestal-bug ... Fix pedestal item disappearing (fixes #3476)	2022-03-10 20:51:57 +01:00
TheBusyBiscuit	3432941ba4	[CI skip] Merge pull request #3470 from J3fftw1/master ... added rooted dirt to dirt variants (fixes #3469)	2022-03-10 20:48:47 +01:00
Jeffrey Kosse	280440857b	fixes #3483	2022-03-09 21:22:08 +01:00
TheBusyBiscuit	dc35bda574	Merge pull request #3451 from FN-FAL113/master ... Allow Fluid Pump to fill water bottles	2022-03-09 15:57:46 +01:00
TheBusyBiscuit	e9ab775630	Merge pull request #3448 from StarWishsama/chore/guide-search-improve ... Improve guide search result	2022-03-09 15:55:18 +01:00
TheBusyBiscuit	7668a786ca	Merge pull request #3309 from svr333/AddMiddleClickSupport ... Implement Middle Click support for Slimefun Items	2022-03-09 14:29:05 +01:00
TheBusyBiscuit	fe2990991c	[CI skip] Merge pull request #3477 from TheSilentPro/additions ... unlocalized name and some docs	2022-03-09 14:26:17 +01:00
TheBusyBiscuit	bd3640c7a8	[CI skip] Improved color codes test	2022-03-09 14:13:03 +01:00
TheBusyBiscuit	96f145385d	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git	2022-03-09 14:12:40 +01:00
The Busy Bot	5adafcda64	[CI skip] New locale updates from Crowdin	2022-03-09 14:12:24 +01:00
TheBusyBiscuit	d78110b527	[CI skip] Added test to catch faulty color codes	2022-03-09 13:37:33 +01:00
The Busy Bot	1e40932dab	[CI skip] New locale updates from Crowdin	2022-03-09 13:12:32 +01:00
FN-FAL113	3c0dadef33	Added missing map import	2022-03-09 08:21:20 +08:00
FN-FAL113	de36da446f	assign return value to a variable and loop values	2022-03-08 21:05:52 +08:00
FN-FAL113	f657016aa8	Update fix comment	2022-03-08 10:12:05 +08:00
FN-FAL113	82941dd8e8	fix a little typo from a comment	2022-03-08 10:10:54 +08:00
FN-FAL113	a11ca349fa	Use the return value of addItem as basis for dropping left overs	2022-03-08 10:06:58 +08:00
FN-FAL113	9ea414bd04	Update AncientAltarListener.java	2022-03-07 08:39:19 +08:00
svr333	f83fedadbd	Add '.' after summary	2022-03-05 13:42:14 +01:00
FN-FAL113	de5524ad9a	Fix pedestal bug	2022-03-05 11:51:45 +08:00
Silent	b7c90fe400	unlocalized name and some docs	2022-03-02 17:02:10 +01:00
qwertyuioplkjhgfd	73c33e0100	Make round robin better	2022-02-25 20:51:16 -08:00
Jeffrey Kosse	7dd9cc9d11	added rooted dirt to dirt variants	2022-02-20 21:46:28 +01:00
The Busy Bot	1773ae0a4a	[CI skip] New locale updates from Crowdin	2022-02-06 01:58:00 +01:00
The Busy Bot	bca4d14a56	[CI skip] New locale updates from Crowdin	2022-02-05 11:52:43 +01:00
TheBusyBiscuit	78660f01f4	Update default value	2022-02-02 14:22:54 +01:00
StarWishsama	d82ae5bad6	chore(typo): fix isHiddenItemGroup typo ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2022-02-01 19:12:06 +08:00
StarWishsama	1af533733c	chore(typo): fix config type ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2022-02-01 19:11:44 +08:00
StarWishsama	c7539c5990	improve(guide): rename showHiddenItemInSearch to showHiddenItemGroupsInSearch	2022-02-01 11:39:50 +08:00
FN-FAL113	b00286e607	Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/MiningTask.java ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2022-01-31 18:12:56 +08:00
StarWishsama	23a11b2f93	feat(guide): add config options for show hidden item	2022-01-31 12:45:45 +08:00
FN-FAL113	6cc4695e8c	Remove nested condition	2022-01-31 10:11:00 +08:00
FN-FAL113	45b4268871	Industrial miner fix	2022-01-31 09:16:17 +08:00
FN-FAL113	edeb4aa1c7	Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/FluidPump.java ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2022-01-30 22:25:02 +08:00