184 Commits

Author	SHA1	Message	Date
TheBusyBiscuit	dba52edc47	Merge branch 'master' into experimental	2020-08-24 21:12:38 +02:00
TheBusyBiscuit	4bc22ab106	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 ... into experimental Conflicts: CHANGELOG.md	2020-08-24 21:12:04 +02:00
TheBusyBiscuit	8c2038634f	Fixed dual wielding climbing picks and added messages	2020-08-24 20:31:54 +02:00
TheBusyBiscuit	b81959e7a0	Added dual-wielding to the Climbing Pick	2020-08-24 20:19:24 +02:00
TheBusyBiscuit	f51a19777f	[CI skip] Added more Unit tests	2020-08-23 17:56:38 +02:00
TheBusyBiscuit	ec95797cbf	Fixes #2240	2020-08-22 02:38:17 +02:00
TheBusyBiscuit	e839ece670	Reduced technical debt	2020-08-22 00:57:44 +02:00
LinoxGH	5f78e7a854	Merge branch 'master' into IcePick	2020-08-20 11:43:14 +03:00
TheBusyBiscuit	aa22e7c9b2	[CI skip] A bit of refactoring and documentation	2020-08-19 13:54:46 +02:00
TheBusyBiscuit	1bba2efa3e	[CI skip] Added more unit tests	2020-08-17 02:23:28 +02:00
TheBusyBiscuit	485a80f6ef	Fixes #2209	2020-08-09 11:41:15 +02:00
TheBusyBiscuit	bffbb488ba	[CI skip] Added Unit Tests for Piglins	2020-08-08 00:45:01 +02:00
TheBusyBiscuit	7c3599c862	[CI skip] Reduced technical debt	2020-08-05 16:44:43 +02:00
TheBusyBiscuit	c56ebe9c23	Merge branch 'master' into IcePick	2020-08-04 19:12:00 +02:00
TheBusyBiscuit	23d730cd7a	Some more refactoring	2020-08-02 14:04:24 +02:00
TheBusyBiscuit	e52d062ef5	Reduced technical debt and clutter	2020-08-02 11:22:00 +02:00
LinoxGH	3b17874ea2	Merge branch 'experimental' into IcePick	2020-07-24 19:39:59 +03:00
TheBusyBiscuit	1f7b75b823	Added Iron Golem Assembler (experimental)	2020-07-23 12:02:53 +02:00
Daniel Walsh	5e3eccfaa4	Fix some regex, finals and replace isPresent with ifPresent	2020-07-22 18:06:42 +01:00
TheBusyBiscuit	f1e650b28c	Merge branch 'master' into experimental	2020-07-21 10:18:34 +02:00
TheBusyBiscuit	6eebb79314	Fixed	2020-07-21 09:56:29 +02:00
TheBusyBiscuit	29b26ed327	Made requested changes	2020-07-20 16:30:20 +02:00
TheBusyBiscuit	397f194029	Fixed two synchronization issues	2020-07-20 13:08:13 +02:00
TheBusyBiscuit	4e0df92b56	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 ... into experimental Conflicts: CHANGELOG.md src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java	2020-07-20 12:46:12 +02:00
TheBusyBiscuit	f4c0c9f905	Minor changes	2020-07-20 10:49:59 +02:00
TheBusyBiscuit	c1d6021216	Optimized teleportations	2020-07-20 02:31:58 +02:00
TheBusyBiscuit	eaaf0c5c01	Another performance improvement to Energy networks	2020-07-15 18:23:21 +02:00
TheBusyBiscuit	c574337318	Reworked Energy Providers (Generators)	2020-07-15 13:17:27 +02:00
TheBusyBiscuit	5c159b4247	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 ... into experimental Conflicts: CHANGELOG.md src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java	2020-07-13 10:41:53 +02:00
TheBusyBiscuit	9af908300f	Fixed a NullPointerException for Error-Reports for generators	2020-07-12 13:19:16 +02:00
TheBusyBiscuit	8fd0afd8bd	Fixes #2081	2020-07-09 18:35:48 +02:00
TheBusyBiscuit	c516cab263	Some refactoring and small optimizations	2020-07-08 11:26:44 +02:00
LinoxGH	ca2c068e7a	Merge branch 'experimental' into IcePick	2020-07-06 20:13:18 +03:00
TheBusyBiscuit	b01254eb9d	Added Reinforced Cloth	2020-07-05 13:01:17 +02:00
TheBusyBiscuit	74cf035709	Fixed a NullPointerException	2020-07-05 12:13:03 +02:00
TheBusyBiscuit	9426ebb2e9	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 ... into experimental Conflicts: src/main/java/io/github/thebusybiscuit/slimefun4/implementation/SlimefunPlugin.java	2020-07-05 12:08:30 +02:00
TheBusyBiscuit	172a2c47fb	Added a directional cache to Cargo Nodes, should improve performance	2020-07-02 18:04:26 +02:00
LinoxGH	12176a9ae7	Merge branch 'experimental' into IcePick	2020-06-30 13:09:02 +03:00
TheBusyBiscuit	3415a124c7	A bunch of refactoring	2020-06-29 15:47:51 +02:00
LinoxGH	ef1735985e	Did the requested changes, enabled and fixed JUnit test.	2020-06-28 16:42:46 +03:00
LinoxGH	073fe1322b	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into IcePick ... Conflicts: src/test/java/io/github/thebusybiscuit/slimefun4/testing/TestUtilities.java	2020-06-28 14:42:34 +03:00
LinoxGH	3e271ac786	Did more requested changes.	2020-06-28 05:29:51 +03:00
LinoxGH	64a1b247b4	Did the requested changes + fixes.	2020-06-27 17:30:28 +03:00
LinoxGH	ba0c3b30dd	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into HazmatSuitBees ... Conflicts: src/main/java/me/mrCookieSlime/Slimefun/SlimefunPlugin.java	2020-06-27 16:01:36 +03:00
TheBusyBiscuit	3dc043c857	Refactoring: Relocated Plugin class	2020-06-27 13:10:47 +02:00
LinoxGH	73973a00b7	Did the requested changes and some fixes.	2020-06-27 12:26:15 +03:00
TheBusyBiscuit	0dfd40e407	Fixed a few more color codes for 1.16 (Sorry Walshy :P )	2020-06-27 02:35:29 +02:00
LinoxGH	bc074c83ee	Did the requested changes.	2020-06-27 02:22:17 +03:00
LinoxGH	9fcbe94553	Organized the new imports.	2020-06-27 00:13:00 +03:00
LinoxGH	207cb35dda	Added Climbing Pick	2020-06-26 22:03:17 +03:00