5442 Commits

Author	SHA1	Message	Date
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
svr333	f83fedadbd	Add '.' after summary	2022-03-05 13:42:14 +01:00
Silent	b7c90fe400	unlocalized name and some docs	2022-03-02 17:02:10 +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
The Busy Bot	d38dd0d992	[CI skip] New locale updates from Crowdin	2022-01-20 19:29:28 +01:00
Senne	e02e089b7f	Add ParamsAreNonNullByDefault	2022-01-19 17:37:48 +01:00
Senne	0a8aff0695	Merge branch 'master' into AddMiddleClickSupport	2022-01-18 22:01:23 +01:00
TheBusyBiscuit	dd16b7c84c	[CI skip] Fixed javadocs	2022-01-18 20:03:52 +01:00
TheBusyBiscuit	e02eedd940	Merge pull request #3275 from Sfiguz7/fix/itemsadder_cargo_stacking ... Fixes #3133	2022-01-18 17:52:08 +01:00
Daniel Walsh	3ac8cadbc1	Fix multi-line comment	2022-01-18 14:02:50 +00:00
The Busy Bot	0a1724b63e	[CI skip] New locale updates from Crowdin	2022-01-18 13:31:11 +01:00
Daniel Walsh	220cfc9058	Update dough	2022-01-16 16:54:19 +00:00
TheBusyBiscuit	0a94854629	[CI skip] Merge pull request #3415 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.18-1.x ... Update dependency com.github.seeseemelk:MockBukkit-v1.18 to v1.15.5	2022-01-16 15:13:00 +01:00
TheBusyBiscuit	eff4bf133d	Fixed unit tests	2022-01-16 15:05:01 +01:00
TheBusyBiscuit	014f832347	Fixed #3429	2022-01-16 15:02:05 +01:00
TheBusyBiscuit	e8f2a5fc49	[CI skip] Uninitialized ItemSettings will now cause test failures	2022-01-16 14:57:27 +01:00
TheBusyBiscuit	c1074faeb2	Added PlayerProfile#hasUnlockedEverything() ... and also updated all workflows to JDK 17	2022-01-16 14:17:50 +01:00
TheBusyBiscuit	6ec11e17ef	Merge pull request #3428 from J3fftw1/feature/VanillaTransformationIceInFreezer ... Added vanilla ratios to the freezer	2022-01-15 22:49:24 +01:00
J3fftw	4f2900045a	Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/Freezer.java ... Co-authored-by: Daniel Walsh <walshydev@gmail.com>	2022-01-15 22:29:22 +01:00
J3fftw	5af5fbf973	Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/Freezer.java ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2022-01-15 18:48:22 +01:00
Jeffrey Kosse	fb3f76e9eb	did requested changes	2022-01-15 18:40:39 +01:00
Jeffrey Kosse	155feede96	you are a dog	2022-01-15 18:10:56 +01:00
Jeffrey Kosse	2e94b101ae	formatting where?	2022-01-15 18:09:05 +01:00
Jeffrey Kosse	e38a6bf80b	formatting where?	2022-01-15 18:08:22 +01:00
Jeffrey Kosse	0d80b295ff	fixed imports	2022-01-15 17:57:26 +01:00
Jeffrey Kosse	4aaa6db05f	added vanilla transformation to ice	2022-01-15 17:56:18 +01:00
poma123	2bc0313b2a	Added a new fromJson method with isLenient parameter	2022-01-15 17:19:50 +01:00
poma123	ecdf4f939c	Made BiomeMapParser public	2022-01-14 12:13:21 +01:00
Senne	fc8ffabbcf	Switch to sfItem.isItem()	2022-01-12 22:23:19 +01:00
TheBusyBiscuit	5c1dda32a4	[CI skip] Some unit test changes	2022-01-04 01:30:21 +01:00
svr333	7f8ef8be84	Minor tweaks ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2022-01-02 15:17:45 +01:00
TheBusyBiscuit	eac32ac94c	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git	2022-01-02 12:51:38 +01:00
TheBusyBiscuit	f2f3a6c719	Fixed unit test	2022-01-02 12:51:30 +01:00
TheBusyBiscuit	730f2676b3	Merge pull request #3401 from variananora/feature/add-fuel-to-bio-reactor ... Add fuel types to BioGenerator	2022-01-02 12:48:06 +01:00
TheBusyBiscuit	3d87cb3df1	Fixed #3400	2022-01-02 12:47:22 +01:00
Varian Anora	9703016ae2	Added 1.17 items and blocks	2022-01-02 18:31:46 +07:00
Varian Anora	311d600095	Add fuel types to BioGenerator	2022-01-02 18:02:52 +07:00
Senne	ef8e84a350	Invert if statement	2022-01-01 22:48:16 +01:00
Senne	4792124224	Refactor MiddleClickListener	2022-01-01 22:46:11 +01:00
TheBusyBiscuit	3993f48499	Some boring refactoring work	2022-01-01 14:34:36 +01:00
TheBusyBiscuit	0538e34578	Added Armored Jetpack recipe (resolves #1315)	2022-01-01 01:01:52 +01:00
TheBusyBiscuit	96aaa9de43	Fixed #3368	2022-01-01 00:57:13 +01:00
TheBusyBiscuit	8114729e16	Fixed #3390	2021-12-31 18:29:21 +01:00