1543 Commits

Author	SHA1	Message	Date
TheBusyBiscuit	db789f1b0d	A little bit of additional refactoring	2021-01-01 00:45:05 +01:00
TheBusyBiscuit	bd9d496b4d	Enforce Server Software requirements	2020-12-31 16:33:43 +01:00
Daniel Walsh	9c31c746dd	Requested changes	2020-12-23 22:16:45 +00:00
Daniel Walsh	6cf2051e60	Panda smells	2020-12-23 14:56:51 +00:00
Daniel Walsh	00c233dee5	Move to a method	2020-12-23 14:32:47 +00:00
Daniel Walsh	2872cf8a2e	Fixed #2647	2020-12-23 14:17:35 +00:00
Patbox	d7a8903211	Temponary fix for #2636	2020-12-19 16:30:38 +01:00
TheBusyBiscuit	f755e943c4	[CI skip] Refactoring and code cleanup	2020-12-17 18:30:51 +01:00
TheBusyBiscuit	2ced45b485	Merge pull request #2609 from Slimefun/refactoring/third-party-integrations ... Refactored integrations (+ Fixed #2575)	2020-12-17 15:30:16 +01:00
TheBusyBiscuit	e6114f7e4b	[CI skip] Updated translators list	2020-12-17 13:33:23 +01:00
TheBusyBiscuit	3d54080001	[CI skip] A bit o refactoring	2020-12-12 14:00:11 +01:00
TheBusyBiscuit	498da0e00a	[CI skip] Merge pull request #2598 from Slimefun/feature/bee-armor ... Added Bee Armor	2020-12-11 13:05:20 +01:00
Senne Van Rompaey	3acd6926ad	Merge branch 'master' into refactoring/third-party-integrations	2020-12-10 22:02:21 +01:00
Patbox	28e5771ca8	Implement more suggestions	2020-12-10 12:38:31 +01:00
TheBusyBiscuit	36be4c29de	More refactoring	2020-12-09 13:33:34 +01:00
TheBusyBiscuit	7d9e726102	More refactoring	2020-12-09 12:39:24 +01:00
TheBusyBiscuit	88c81a9cc2	Added ItemsAdder support (fixes #2575)	2020-12-09 11:41:59 +01:00
TheBusyBiscuit	2e13cd2e88	Refactoring for third-party integrations	2020-12-08 21:07:48 +01:00
TheBusyBiscuit	56316426aa	Updated to latest Slimefun version	2020-12-05 21:50:46 +01:00
TheBusyBiscuit	bd213a7789	No idea what that was doing here...	2020-12-05 21:45:42 +01:00
TheBusyBiscuit	9504e523f4	Merge branch 'master' into feature/bee-armor	2020-12-05 21:43:40 +01:00
Patbox	7afb9b9791	Implement more suggestions	2020-12-05 20:51:30 +01:00
Patbox	ff634c0f5c	Make code better	2020-12-05 20:22:03 +01:00
Patbox	f4633c528f	Fix ghost blocks	2020-12-05 17:48:17 +01:00
TheBusyBiscuit	5d15a7e5cf	Another small change	2020-12-03 10:38:03 +01:00
TheBusyBiscuit	e1a3bf730b	Made requested changes	2020-12-03 10:34:05 +01:00
TheBusyBiscuit	90df68b0e0	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into optimization/cargo-filters	2020-12-03 10:23:18 +01:00
TheBusyBiscuit	96e38608f9	Added 4 bricks -> 1 brick block recipe to the Electric Press	2020-12-01 16:37:51 +01:00
TheBusyBiscuit	5d0ed3570d	Fixes #2583	2020-12-01 16:12:57 +01:00
TheBusyBiscuit	ac7bb44d98	Fixes #2585	2020-12-01 11:46:59 +01:00
TheBusyBiscuit	b4edc6c5bf	Fixes #2496	2020-11-30 17:39:31 +01:00
TheBusyBiscuit	1d4cb85cb1	Fixes #2576	2020-11-30 17:03:17 +01:00
TheBusyBiscuit	c4619ecbaa	Fixes #2574	2020-11-30 15:13:53 +01:00
TheBusyBiscuit	3e645a148f	Refactoring	2020-11-26 18:21:10 +01:00
TheBusyBiscuit	d0e7e21877	Performance and memory improvements	2020-11-25 14:27:46 +01:00
TheBusyBiscuit	925cb9d0d1	[Ci skip] A small code improvement	2020-11-23 18:37:20 +01:00
TheBusyBiscuit	354dd30e52	Removed EmeraldEnchants integration	2020-11-23 16:58:08 +01:00
TheBusyBiscuit	4a6418cd7d	[CI skip] Updated translators list	2020-11-23 16:34:47 +01:00
TheBusyBiscuit	497359568e	[Ci skip] Refactoring and documentation	2020-11-22 14:06:06 +01:00
TheBusyBiscuit	f689c2fc4f	Added an item setting to the Infused Hopper to toggle it with redstone	2020-11-21 15:34:09 +01:00
TheBusyBiscuit	3bd595a930	Fixes #2421	2020-11-21 14:18:54 +01:00
TheBusyBiscuit	55188bfd0a	Fixes #2518 (+ refactoring and documentation)	2020-11-21 14:06:38 +01:00
TheBusyBiscuit	5bf3e38bae	Fixed Armor Stands getting damaged/pushed by Explosive Bow	2020-11-20 13:39:25 +01:00
TheBusyBiscuit	1f32b160a5	Update src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/AbstractItemNetwork.java ... Co-authored-by: Senne Van Rompaey <vanrompaey.senne@protonmail.com>	2020-11-20 03:00:23 +01:00
TheBusyBiscuit	c5f6b53412	Updated unit tests for new elapsed time method	2020-11-20 00:34:29 +01:00
TheBusyBiscuit	d8563eb5dc	Fixed some docs	2020-11-19 22:22:42 +01:00
TheBusyBiscuit	f2a6d97f29	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git	2020-11-19 22:21:01 +01:00
TheBusyBiscuit	15f281504f	More performance and memory improvements	2020-11-19 22:20:43 +01:00
TheBusyBiscuit	bb764b7584	Fixed Guide Settings showing "last activity" as a negative number	2020-11-19 21:00:28 +01:00
TheBusyBiscuit	eea3254d11	Merge pull request #2555 from wzpzw5/patch-10 ... Fixed a bug of Duplicate items with BlockPlacer	2020-11-19 18:08:02 +01:00