951 Commits

Author	SHA1	Message	Date
TheBusyBiscuit	6b4f914784	Some more refactoring	2020-08-29 14:20:33 +02:00
TheBusyBiscuit	e3f7e68468	Fixed a merging issue	2020-08-29 14:09:41 +02:00
TheBusyBiscuit	dc233997ae	Merge branch 'master' into refactoring/block-energy	2020-08-29 12:47:50 +02:00
TheBusyBiscuit	ac5d5521ce	Fixes #2260	2020-08-28 23:35:11 +02:00
TheBusyBiscuit	ec6f48e374	[CI skip] Refactoring	2020-08-28 23:35:05 +02:00
TheBusyBiscuit	5bef6a9ec8	Fixes #2257	2020-08-28 23:18:43 +02:00
TheBusyBiscuit	83b66232fa	Fixes #2251	2020-08-28 20:03:45 +02:00
LinoxGH	f371a5fda6	Fixed a stupid issue and added some docs.	2020-08-27 20:53:13 +03:00
LinoxGH	8c1cccc390	Forgot about imports.	2020-08-27 20:33:01 +03:00
LinoxGH	fd665843a0	Did requested changes.	2020-08-27 20:20:13 +03:00
LinoxGH	53abf76a35	Fixed Fluid Pump dupe.	2020-08-27 20:08:02 +03:00
TheBusyBiscuit	f97935b5c7	Deleted unused class	2020-08-27 14:29:02 +02:00
TheBusyBiscuit	fcbae02a4b	Fixs #2208	2020-08-27 14:16:09 +02:00
TheBusyBiscuit	4232caf17a	[CI skip] Reduced technical debt	2020-08-27 13:16:38 +02:00
TheBusyBiscuit	4dab0c5b47	Merge branch 'master' of https://github.com/TheBusyBiscuit/Slimefun4 into refactoring/block-energy	2020-08-26 17:51:43 +02:00
TheBusyBiscuit	3bc943bdb2	Little bit of refactoring	2020-08-26 14:33:40 +02:00
TheBusyBiscuit	c8ab9e8568	Fixes #1022	2020-08-26 14:31:51 +02:00
TheBusyBiscuit	6e6a953009	Fixes #2249	2020-08-26 12:47:08 +02:00
poma123	7b7c6350c6	Fixed android script editor menu hotkey glitch	2020-08-24 15:30:51 +02:00
TheBusyBiscuit	a2b2478394	Update EnergyNet.java	2020-08-24 02:18:32 +02:00
TheBusyBiscuit	d998f3ec8c	Merge branch 'master' into refactoring/block-energy	2020-08-24 02:11:59 +02:00
Sfiguz7	89fdf45d28	I said, fixed extra indentation	2020-08-23 17:50:31 +02:00
Sfiguz7	44451d6244	Fixed extra indentation	2020-08-23 17:49:44 +02:00
Sfiguz7	813200b29c	Made requested changes	2020-08-23 15:36:10 +02:00
Sfiguz7	bdd2adc21e	Cleared unused imports I forgot to delete	2020-08-23 13:56:39 +02:00
Sfiguz7	eb66f3e183	Added option to drop excess items on /sf give	2020-08-23 13:54:51 +02:00
TheBusyBiscuit	ec95797cbf	Fixes #2240	2020-08-22 02:38:17 +02:00
TheBusyBiscuit	b36e3e41a8	Reduced technical debt	2020-08-22 02:36:36 +02:00
TheBusyBiscuit	e839ece670	Reduced technical debt	2020-08-22 00:57:44 +02:00
TheBusyBiscuit	95655dc6fc	A few fixes and performance improvements	2020-08-21 15:19:08 +02:00
TheBusyBiscuit	167326292d	Maybe fixes #1951 (+ performance improvements)	2020-08-20 23:25:43 +02:00
TheBusyBiscuit	88be3e79ff	Merge branch 'master' into refactoring/block-energy	2020-08-20 16:55:35 +02:00
TheBusyBiscuit	aa22e7c9b2	[CI skip] A bit of refactoring and documentation	2020-08-19 13:54:46 +02:00
TheBusyBiscuit	9d4d2060ba	[CI skip] Added a few more strings to translation files	2020-08-18 14:45:51 +02:00
TheBusyBiscuit	6be0709aea	Fixes #2138	2020-08-18 14:18:44 +02:00
TheBusyBiscuit	8e8a87fce6	Fixed ChestTerminal timings showing up as cargo nodes	2020-08-17 17:31:15 +02:00
TheBusyBiscuit	d4953dd029	[CI skip] Added more Unit Tests	2020-08-17 13:00:22 +02:00
TheBusyBiscuit	1bba2efa3e	[CI skip] Added more unit tests	2020-08-17 02:23:28 +02:00
TheBusyBiscuit	7a31c88ce9	Fixes #2207	2020-08-17 00:32:18 +02:00
TheBusyBiscuit	2a8abcbdbf	Fixed unit tests, also improved test coverage	2020-08-16 15:57:09 +02:00
TheBusyBiscuit	037e8d83df	Small performance improvement, also reduced technical debt a bit	2020-08-16 15:49:47 +02:00
TheBusyBiscuit	eb5b2678e0	Fixes #2077	2020-08-14 01:46:05 +02:00
TheBusyBiscuit	c0d18c5c89	Fixes #2217	2020-08-13 21:13:19 +02:00
TheBusyBiscuit	923b59c6e7	[CI skip] Reduced technical debt	2020-08-11 16:28:52 +02:00
TheBusyBiscuit	e406481b98	[CI skip] Replaced the last tabs with spaces	2020-08-11 16:23:31 +02:00
TheBusyBiscuit	1aaedf0825	[CI skip] Added more Unit Tests	2020-08-11 11:17:08 +02:00
TheBusyBiscuit	485a80f6ef	Fixes #2209	2020-08-09 11:41:15 +02:00
TheBusyBiscuit	66f4c48b4b	Fixes #2205	2020-08-09 11:33:48 +02:00
TheBusyBiscuit	7de9dd6683	Industrial Miners can now also mine Gilded Blackstone	2020-08-08 12:51:26 +02:00
TheBusyBiscuit	9f49dd3981	Reduced technical debt	2020-08-08 12:47:39 +02:00