769 Commits

Author	SHA1	Message	Date
TheBusyBiscuit	0dc1ac3894	Added Produce Collector to automate Milk and Mushroom Stew ... Also fixed Auto Crafters not handling milk buckets properly And allowed Block Placers to place down cakes	2021-03-28 01:40:19 +01:00
Daniel Walsh	cb2052ec93	Fixes #2914	2021-03-27 22:52:14 +00:00
TheBusyBiscuit	fd16306b61	Auto-Crafters can now be turned on and off via the gui	2021-03-27 22:26:15 +01:00
TheBusyBiscuit	235d3f4d57	Added Auto-Crafter for the Armor Forge	2021-03-27 18:58:31 +01:00
TheBusyBiscuit	70db23bdc5	Fixes #2913	2021-03-27 18:36:30 +01:00
TheBusyBiscuit	090a0f7791	Merge branch 'chore/cleanup-deprecated-crafter'	2021-03-27 11:52:54 +01:00
TheBusyBiscuit	ba984728e7	Added "Netherite Ingot -> Netherite Block" recipe to Electric Press	2021-03-26 20:58:22 +01:00
TheBusyBiscuit	f4bded9491	Added "Smart-Filling" mode to Cargo Input Nodes	2021-03-25 18:39:07 +01:00
TheBusyBiscuit	cc421e7e33	Fixes #2906	2021-03-25 13:59:57 +01:00
TheBusyBiscuit	e3171b37dc	Merge branch 'chore/cleanup-deprecated-crafter'	2021-03-22 19:20:18 +01:00
TheBusyBiscuit	e277732608	Fixes #2899	2021-03-22 15:43:20 +01:00
TheBusyBiscuit	328f9d3331	[CI skip] Automated Crafting Chambers will no longer work.	2021-03-22 10:23:54 +01:00
TheBusyBiscuit	13355c1afe	Fixes #2896	2021-03-22 10:04:57 +01:00
TheBusyBiscuit	001e7654aa	Fixed #2895	2021-03-21 20:06:46 +01:00
TheBusyBiscuit	0803529176	Merge pull request #2807 from Slimefun/feature/auto-crafters ... Added Vanilla Auto-Crafter and Enhanced Auto-Crafter	2021-03-21 18:44:42 +01:00
TheBusyBiscuit	8161b9ee6d	Fixed Enhanced Furnace not dropping any items when broken	2021-03-19 00:39:41 +01:00
TheBusyBiscuit	320ee27b3d	Merge branch 'master' into feature/auto-crafters	2021-03-17 10:54:37 +01:00
TheBusyBiscuit	4531d2d142	[CI skip] Updated changelog	2021-03-17 10:53:30 +01:00
TheBusyBiscuit	79e40e1480	Pulled latest changes from 'master'	2021-03-14 14:30:19 +01:00
TheBusyBiscuit	aa349ccd0f	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into feature/auto-crafters	2021-03-14 14:29:30 +01:00
TheBusyBiscuit	6e4a1ccf5f	[CI skip] Removed temporary redirects	2021-03-14 13:34:17 +01:00
TheBusyBiscuit	51d0435718	Trigger another build... ... Previous one failed due to some maven repository issues. This is always fun.	2021-03-14 11:28:52 +01:00
TheBusyBiscuit	e39c2b661c	Fixes #2883	2021-03-14 11:02:47 +01:00
TheBusyBiscuit	fbd701bced	Fixed Mining Androids and improved itemsettings API	2021-03-13 21:56:54 +01:00
TheBusyBiscuit	a3ecde181e	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into feature/auto-crafters	2021-03-13 10:59:57 +01:00
TheBusyBiscuit	4aec2ffbcf	Fixes #2878	2021-03-13 00:18:02 +01:00
TheBusyBiscuit	5d4412d3cd	[CI skip] Updated changelog	2021-03-11 11:15:23 +01:00
TheBusyBiscuit	f0b5e8463f	[CI skip] Updated changelog	2021-03-11 02:22:02 +01:00
Daniel Walsh	4b5ad219ec	Merge pull request #2328 from Slimefun/performance/cobblestone ... This totally wasn't sitting fully approved for 16 days 👀	2021-03-11 00:52:41 +00:00
TheBusyBiscuit	4678de1697	Fixes #2877 and added a new config option to crucibles	2021-03-10 14:04:33 +01:00
TheBusyBiscuit	86edb0df6a	Fixes #2876	2021-03-10 13:36:28 +01:00
TheBusyBiscuit	0fa862314f	Fixes #2856	2021-03-10 00:49:53 +01:00
TheBusyBiscuit	bef0cfb413	Fixed #2861	2021-03-10 00:24:05 +01:00
TheBusyBiscuit	717e8c84a0	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into ... feature/auto-crafters Conflicts: src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/BookBinder.java	2021-03-09 16:44:54 +01:00
TheBusyBiscuit	3bef3b1e73	[CI skip] Updated changelog	2021-03-05 09:58:35 +01:00
TheBusyBiscuit	8c1c67731b	Fixes #2852	2021-03-01 09:31:59 +01:00
TheBusyBiscuit	51b56b1e0b	Fixes #2851	2021-03-01 09:30:38 +01:00
TheBusyBiscuit	84ad08be37	Fixes #2849	2021-02-27 10:19:19 +01:00
TheBusyBiscuit	c4be51f7bb	Fixes #2839	2021-02-24 15:57:21 +01:00
TheBusyBiscuit	659f329349	Merge branch 'master' into feature/auto-crafters	2021-02-23 11:11:26 +01:00
TheBusyBiscuit	acde60a01b	[CI skip] Updated changelog	2021-02-23 11:05:29 +01:00
TheBusyBiscuit	d73e96cff7	[CI skip] Updated changelog	2021-02-23 11:02:26 +01:00
TheBusyBiscuit	338fe0f84b	Merge pull request #2597 from Slimefun/fixes/blocks fixes #2560 ... Refactoring + Fixes to Block Handlers	2021-02-22 18:34:19 +01:00
TheBusyBiscuit	2754703f9d	Merge branch 'master' into feature/auto-crafters	2021-02-10 18:34:34 +01:00
TheBusyBiscuit	854c3335e9	Fixes #2818	2021-02-10 18:33:34 +01:00
TheBusyBiscuit	e2f3944d66	Fixes #2817	2021-02-09 17:08:49 +01:00
TheBusyBiscuit	b224123918	Fixes #2804	2021-02-07 18:26:08 +01:00
TheBusyBiscuit	e47d0171cc	Fixes #2810	2021-02-07 12:30:55 +01:00
TheBusyBiscuit	9e83b4af00	Fixes #2809	2021-02-06 20:23:32 +01:00
TheBusyBiscuit	7ddd0469eb	Deprecated Automated Crafting Chamber (soon to be replaced)	2021-02-06 19:32:41 +01:00
TheBusyBiscuit	a5a16621ee	Merge branch 'master' into feature/auto-crafters	2021-02-06 11:19:07 +01:00
TheBusyBiscuit	47743b632e	Fixed an exception when disabled in an invalid environment.	2021-02-06 11:18:09 +01:00
TheBusyBiscuit	7d50d0eb32	Fixes #1161	2021-02-05 18:40:41 +01:00
TheBusyBiscuit	3544f56f73	Updated changelog	2021-02-05 15:18:48 +01:00
TheBusyBiscuit	fe2e5c1444	Update CHANGELOG.md	2021-02-02 18:34:05 +01:00
Daniel Walsh	b74eb5b30d	Merge pull request #2782 from Slimefun/feature/taisman-actionbar ... Allow Talismans to use the Actionbar	2021-02-02 17:27:47 +00:00
TheBusyBiscuit	6d89d38c3a	Fixes #2793	2021-02-02 10:05:08 +01:00
TheBusyBiscuit	e99a39d2ab	Fixes #2794	2021-02-02 09:39:22 +01:00
TheBusyBiscuit	fe42f6fa9f	Nether Wart Blocks can be turned into Nether Warts using a Grind Stone	2021-02-01 10:47:31 +01:00
TheBusyBiscuit	5aaed5d814	[CI skip] Updated changelog	2021-01-30 13:14:27 +01:00
TheBusyBiscuit	c523fc279f	[CI skip] Updated changelog	2021-01-29 16:34:32 +01:00
TheBusyBiscuit	ee7786b8e4	Allow Talismans to use the Actionbar	2021-01-29 03:02:50 +01:00
TheBusyBiscuit	8cf0f61f3e	Added placeholder for unloaded profiles to PlaceholderAPI integration	2021-01-28 18:21:22 +01:00
TheBusyBiscuit	2d244420a9	[CI skip] Added a release date	2021-01-28 14:51:02 +01:00
TheBusyBiscuit	cadf66a13c	Merge branch 'master' into fixes/blocks	2021-01-28 13:41:27 +01:00
TheBusyBiscuit	6df052e4cf	Fixes #2771	2021-01-28 12:37:13 +01:00
TheBusyBiscuit	7ffc8aff24	Fixes #2760	2021-01-26 10:35:47 +01:00
TheBusyBiscuit	9436ce451a	Fixes #2460	2021-01-26 10:07:12 +01:00
TheBusyBiscuit	2085d9eeba	[CI skip] Updated changelog	2021-01-26 00:56:03 +01:00
TheBusyBiscuit	8d85ce2720	Update CHANGELOG.md	2021-01-25 16:46:52 +01:00
TheBusyBiscuit	3e5926c5c2	Update CHANGELOG.md	2021-01-25 16:36:24 +01:00
TheBusyBiscuit	0b4c2f2e08	Cherry-picked Talisman of the Wise from #2645	2021-01-24 18:04:52 +01:00
TheBusyBiscuit	17fd2ec570	Added AsyncProfileLoadEvent	2021-01-23 19:38:59 +01:00
TheBusyBiscuit	389a2978c0	Fixes #2754	2021-01-23 14:25:10 +01:00
TheBusyBiscuit	123eb350a0	Update CHANGELOG.md	2021-01-22 13:03:09 +01:00
TheBusyBiscuit	2519df55cc	[CI skip] Updated changelog	2021-01-21 15:56:36 +01:00
TheBusyBiscuit	570c981de3	Merge branch 'master' into fixes/blocks	2021-01-20 17:19:18 +01:00
svr333	ffef8350b1	Merge branch 'master' into performance/cobblestone	2021-01-18 22:18:02 +01:00
TheBusyBiscuit	7eff4d381e	Fixed a small issue with backpacks	2021-01-17 14:27:01 +01:00
TheBusyBiscuit	16ed670573	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into ... refactoring/holograms Conflicts: CHANGELOG.md	2021-01-16 15:56:23 +01:00
TheBusyBiscuit	0feace9c06	Merge pull request #2729 from Slimefun/fix/infused-hopper-picking-up-incorrect-items ... Fix the infused hopper picking up items with pickup delay Short.MAX_VALUE	2021-01-16 15:51:17 +01:00
TheBusyBiscuit	03b4c10bad	[CI skip] Updated changelog	2021-01-16 14:46:00 +01:00
TheBusyBiscuit	34d18c5547	Merge branch 'master' into refactoring/holograms	2021-01-16 11:34:24 +01:00
Daniel Walsh	55d2f82dcd	Merge branch 'master' into fix/infused-hopper-picking-up-incorrect-items	2021-01-16 10:33:16 +00:00
TheBusyBiscuit	7c929a2f22	Fixes #2728	2021-01-16 11:30:39 +01:00
Daniel Walsh	5c2a2faa79	Add to changelog	2021-01-16 10:30:31 +00:00
TheBusyBiscuit	e523d7849e	Fixes #2662	2021-01-16 11:28:38 +01:00
TheBusyBiscuit	a810458345	[CI skip] Small changes	2021-01-15 11:46:40 +01:00
TheBusyBiscuit	3663a7d43b	Proper error handling and updated changelog	2021-01-15 03:31:33 +01:00
TheBusyBiscuit	ac590fdde3	Fixes #2721	2021-01-14 14:41:09 +01:00
TheBusyBiscuit	ae4e4bed73	Merge branch 'master' into fixes/blocks	2021-01-14 12:35:57 +01:00
TheBusyBiscuit	7826b2359a	Finished fix for #2636 and fixed a threading issue with BlockStates	2021-01-14 11:58:52 +01:00
TheBusyBiscuit	43109ab2d3	Merge branch 'master' into performance/cobblestone	2021-01-14 11:16:39 +01:00
Daniel Walsh	9be11921c7	Merge branch 'master' into fixes/blocks	2021-01-13 18:50:06 +00:00
TheBusyBiscuit	d8004510e5	Updated changelog (fixed two bugs)	2021-01-13 19:48:30 +01:00
TheBusyBiscuit	c92ba89d9a	Merge branch 'master' into performance/cobblestone	2021-01-11 13:58:21 +01:00
TheBusyBiscuit	3777b59596	Merge branch 'master' into fixes/blocks	2021-01-11 13:57:33 +01:00
TheBusyBiscuit	5ed452660f	Fixed elevator order (highest floor first)	2021-01-11 13:07:46 +01:00
TheBusyBiscuit	7a4712f930	Removed obsolete things	2021-01-11 12:33:49 +01:00
TheBusyBiscuit	32474a588b	Added ElevatorFloor class from PR #2699	2021-01-11 10:56:46 +01:00
TheBusyBiscuit	577ad2c308	[CI skip] Prepare RC-19	2021-01-11 10:33:12 +01:00
TheBusyBiscuit	7e48d96fa3	Removed "written book" slimefun guide and disabled elevators	2021-01-11 02:39:54 +01:00
TheBusyBiscuit	2943289c6d	Merge branch 'master' into fixes/blocks	2021-01-10 23:12:34 +01:00
TheBusyBiscuit	4c879ac3b3	Added AndroidFarmEvent (+ refactored Farmer Androids)	2021-01-10 21:20:43 +01:00
TheBusyBiscuit	22b5421118	Fixed /sf timings --verbose not working correctly (+refactoring)	2021-01-10 13:38:07 +01:00
TheBusyBiscuit	e36027fb48	Merge branch 'master' into fixes/blocks	2021-01-06 21:06:26 +01:00
TheBusyBiscuit	e773e68b4a	Merge branch 'master' into performance/cobblestone	2021-01-06 20:24:54 +01:00
TheBusyBiscuit	75b72eb630	Removed deprecated stuff	2021-01-06 16:26:40 +01:00
TheBusyBiscuit	f602b0436b	[CI skip] Updated changelog	2021-01-03 19:50:39 +01:00
TheBusyBiscuit	f2dd3a0125	Fixes #2655	2020-12-31 17:38:51 +01:00
TheBusyBiscuit	aa98bd0ba2	Fixes #2664	2020-12-31 17:08:50 +01:00
TheBusyBiscuit	43af06f888	[CI skip] Updated changelog	2020-12-24 02:27:41 +01:00
TheBusyBiscuit	0d5527793c	[CI skip] Updated changelog	2020-12-20 23:56:00 +01:00
TheBusyBiscuit	8c8685b6de	Merge branch 'master' into fixes/blocks	2020-12-17 15:35:57 +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	3d54080001	[CI skip] A bit o refactoring	2020-12-12 14:00:11 +01:00
TheBusyBiscuit	3c72abad7b	Merge branch 'master' into fixes/blocks	2020-12-10 22:05:25 +01:00
Senne Van Rompaey	3acd6926ad	Merge branch 'master' into refactoring/third-party-integrations	2020-12-10 22:02:21 +01:00
TheBusyBiscuit	8b45a8a009	[CI skip] Updated changelog	2020-12-10 21:50:36 +01:00
TheBusyBiscuit	eac09eea9e	Switched to BlockFormEvent	2020-12-10 12:11:25 +01:00
TheBusyBiscuit	b07a54d515	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into performance/cobblestone	2020-12-10 12:04:48 +01:00
TheBusyBiscuit	f0f545dd9f	Fixed changelog	2020-12-10 00:23:00 +01:00
TheBusyBiscuit	36be4c29de	More refactoring	2020-12-09 13:33:34 +01:00
TheBusyBiscuit	c84200d2c4	Some stuff + fixes #2560	2020-12-05 13:54:46 +01:00
TheBusyBiscuit	282367d6ff	[CI skip] Removed an old version of bStats	2020-12-03 15:51:17 +01:00
TheBusyBiscuit	761126c673	[CI skip] Updated changelog	2020-12-03 15:40:24 +01:00
TheBusyBiscuit	e717b77ddc	[CI skip] Might as well push this today	2020-12-03 15:28:58 +01:00
TheBusyBiscuit	42d393296a	[CI skip] Added a release date for RC-18	2020-12-03 12:28:27 +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	d0e7e21877	Performance and memory improvements	2020-11-25 14:27:46 +01:00
TheBusyBiscuit	354dd30e52	Removed EmeraldEnchants integration	2020-11-23 16:58:08 +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	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	9f1b8790aa	[Ci skip] Updated changelog	2020-11-19 18:07:16 +01:00
TheBusyBiscuit	7e657c9810	A ton of performance improvements	2020-11-19 17:42:10 +01:00
TheBusyBiscuit	94752a9027	Fixes #2558	2020-11-19 15:01:47 +01:00
TheBusyBiscuit	177d1d81e0	[CI skip] Updated changelog	2020-11-19 14:45:55 +01:00
TheBusyBiscuit	86715cd3d0	Fixed CoreProtect not recognizing Slimefun blocks getting broken	2020-11-19 13:11:30 +01:00
TheBusyBiscuit	64fd5a54c3	Added an item setting to configure the Wind Staff velocity	2020-11-19 12:49:42 +01:00
TheBusyBiscuit	0cdd21f6bb	Added a config option to delete excess cargo network items	2020-11-15 16:29:45 +01:00
TheBusyBiscuit	0b9ab8b6cc	Fixes #2446	2020-11-14 18:44:07 +01:00
TheBusyBiscuit	503dbc8367	Fixes #2418	2020-11-14 18:32:53 +01:00
TheBusyBiscuit	05e983917a	Added CoolerFeedPlayerEvent	2020-11-10 00:36:38 +01:00
TheBusyBiscuit	3170f143a2	Added a config option to disable network visualizations	2020-11-04 11:18:06 +01:00
TheBusyBiscuit	7a2586bfcb	[CI skip] Updated changelog	2020-11-03 09:41:32 +01:00
TheBusyBiscuit	1c5f2f650b	Some refactoring and small fixes	2020-11-02 15:10:56 +01:00
TheBusyBiscuit	8536965962	Fixes #2517	2020-11-01 20:59:34 +01:00
TheBusyBiscuit	1141a01fd0	Fixes #2519	2020-11-01 20:46:29 +01:00
TheBusyBiscuit	6ced4d166e	Fixes #2527	2020-11-01 20:12:34 +01:00
TheBusyBiscuit	210c8d20f4	Fixes #2499	2020-10-30 22:50:16 +01:00
TheBusyBiscuit	d90699ee7d	[CI skip] Updated changelog	2020-10-28 12:14:31 +01:00
TheBusyBiscuit	232ee74ceb	Fixed contributors menu not showing everyone	2020-10-28 01:01:25 +01:00
TheBusyBiscuit	b3befbda49	Some code cleanup, documentation and paper optimizations	2020-10-28 00:44:35 +01:00
TheBusyBiscuit	487108df14	Fixes #2505	2020-10-25 14:40:05 +01:00
TheBusyBiscuit	cf283c24ab	[CI skip] Updated changelog	2020-10-20 17:42:57 +02:00
TheBusyBiscuit	48f8311a20	[CI skip] Updated changelog	2020-10-20 16:45:26 +02:00
TheBusyBiscuit	df03c4bd8d	[CI skip] Updated changelog	2020-10-19 12:49:43 +02:00
TheBusyBiscuit	95636818f5	[CI skip] Updated changelog	2020-10-18 19:21:46 +02:00
TheBusyBiscuit	e054fe6682	Fixes #2448	2020-10-18 13:17:18 +02:00
TheBusyBiscuit	4aff61f3b1	Removed 1.13 support	2020-10-17 12:54:36 +02:00
TheBusyBiscuit	e18c7cb245	Fixed a dupe bug with mcMMO	2020-10-15 13:50:12 +02:00
TheBusyBiscuit	88cf1f2df2	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git	2020-10-14 14:57:10 +02:00
TheBusyBiscuit	b88bad3ef6	Fixes #2452	2020-10-14 14:56:52 +02:00
TheBusyBiscuit	f75da6af33	[Ci skip] Seting a release date for RC-17	2020-10-14 14:40:10 +02:00
TheBusyBiscuit	42f849d891	Fixes #2423	2020-10-14 13:31:02 +02:00
TheBusyBiscuit	1ffe2fd493	Fixes #2411	2020-10-14 00:51:21 +02:00
TheBusyBiscuit	50e926d18a	Fixes #2457	2020-10-14 00:34:04 +02:00
TheBusyBiscuit	de1eaca1dc	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git	2020-10-14 00:24:52 +02:00
TheBusyBiscuit	19de4c8476	Fixes #2454 (Added mcMMO support)	2020-10-14 00:24:01 +02:00
TheBusyBiscuit	8dfb235488	[CI skip] Updated changelog	2020-10-13 23:21:15 +02:00
TheBusyBiscuit	5c0b7e2ee2	Fixes #2468	2020-10-13 21:44:24 +02:00
TheBusyBiscuit	eeffb30f4a	[CI skip] Updated changelog	2020-10-13 01:52:07 +02:00
TheBusyBiscuit	87d319cd02	Merge pull request #2382 from LinoxGH/EnergyConnector ... Energy Connectors	2020-10-12 15:49:50 +02:00
TheBusyBiscuit	612aad5d95	Fixes #2424	2020-10-12 12:11:28 +02:00
TheBusyBiscuit	3b7dd68164	Fixes #2450	2020-10-12 11:52:23 +02:00
TheBusyBiscuit	14e18d2962	Fixes #2455	2020-10-12 11:47:13 +02:00
TheBusyBiscuit	c65687acf7	[CI skip] Updated changelog	2020-10-11 18:09:03 +02:00
TheBusyBiscuit	bbe196e838	[CI skip] Updated changelog	2020-10-11 13:45:53 +02:00
LinoxGH	ad505b6cef	Merge branch 'master' into EnergyConnector	2020-10-11 00:26:43 +03:00
LinoxGH	6082abb9b6	Merge branch 'master' into ExplosivePickFix	2020-10-11 00:23:59 +03:00
LinoxGH	fdd33f9182	Update CHANGELOG.md	2020-10-11 00:20:02 +03:00
LinoxGH	8ce474331e	Update CHANGELOG.md	2020-10-10 16:05:41 +03:00
TheBusyBiscuit	d63d6189a9	Merge branch 'master' into performance/cobblestone	2020-10-10 13:49:10 +02:00
TheBusyBiscuit	83e8010e29	Lots of refactoring	2020-10-09 17:39:21 +02:00
TheBusyBiscuit	aab665ffea	Merge branch 'master' into tags	2020-10-09 11:46:47 +02:00
TheBusyBiscuit	a82eb7405a	[CI skip] Updated changelog	2020-10-08 21:20:38 +02:00
TheBusyBiscuit	43284f1534	Merge branch 'master' into performance/cobblestone	2020-10-08 16:19:03 +02:00
TheBusyBiscuit	2d00f3e704	Merge branch 'master' into tags	2020-10-08 16:16:11 +02:00
TheBusyBiscuit	359cba3c13	[CI skip] Updated changelog	2020-10-08 14:36:58 +02:00
poma123	cd00848795	Merge branch 'master' into tags	2020-10-07 17:55:26 +02:00
TheBusyBiscuit	ed8f0e243b	Fixes #2405	2020-10-07 17:48:53 +02:00