652 Commits

Author	SHA1	Message	Date
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
TheBusyBiscuit	c3302d8cbd	Merge branch 'master' into tags	2020-10-07 17:44:27 +02:00
TheBusyBiscuit	354cb201c5	[CI skip] Updated changelog	2020-10-07 16:31:33 +02:00
poma123	7814bdcdee	Merge branch 'master' into tags	2020-10-07 16:11:41 +02:00
TheBusyBiscuit	7b179239e4	[CI skip] Updated changelog	2020-10-07 16:01:19 +02:00
TheBusyBiscuit	c33f73d2fe	[CI skip] Updated changelog	2020-10-07 14:30:01 +02:00
TheBusyBiscuit	47590ac972	Merge branch 'master' into tags	2020-10-06 21:07:49 +02:00
TheBusyBiscuit	d09a7e0f93	Fixes #2391	2020-10-06 21:05:39 +02:00
TheBusyBiscuit	07c84af3b5	Added NotConfigurable attribute	2020-10-06 21:01:18 +02:00
TheBusyBiscuit	b26924bf81	[CI skip] Updated changelog	2020-10-05 22:50:32 +02:00
TheBusyBiscuit	0e6fc92e28	Merge branch 'master' into tags	2020-10-04 00:46:37 +02:00
TheBusyBiscuit	e83e194784	[CI skip] Updated changelog	2020-10-04 00:39:31 +02:00
TheBusyBiscuit	6b3ae3b1cf	Merge branch 'master' into tags	2020-10-03 22:05:13 +02:00
TheBusyBiscuit	a2cb2eb324	[CI skip] Updated changelog	2020-10-03 22:03:30 +02:00
poma123	3ec39ec16a	Merge branch 'master' into tags	2020-10-03 21:46:28 +02:00
TheBusyBiscuit	49b0ec6a9e	[CI skip] Updated changelog	2020-10-03 21:29:13 +02:00
TheBusyBiscuit	ada6ce775c	[CI skip] Updated changelog	2020-10-03 21:13:46 +02:00
poma123	9605ed4d1f	Merge branch 'master' into performance/cobblestone	2020-10-02 14:51:18 +02:00