2732 Commits

Author	SHA1	Message	Date
svr333	d571fc5c18	Change speed to 45 instead of 90	2020-12-06 13:19:02 +01:00
svr333	434d469a0d	Add t3 Electric Ore Grinder	2020-12-06 02:01:39 +01:00
TheBusyBiscuit	282367d6ff	[CI skip] Removed an old version of bStats	2020-12-03 15:51:17 +01:00
TheBusyBiscuit	96c4d9081c	Merge pull request #2503 from Slimefun/optimization/cargo-filters ... Cargo Net Optimization: Cached Item Filters	2020-12-03 15:41:35 +01:00
TheBusyBiscuit	e717b77ddc	[CI skip] Might as well push this today	2020-12-03 15:28:58 +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
Nameless	3a5bfd75cb	Translate researches_zh-CN.yml via GitLocalize	2020-11-28 10:37:27 +00: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	876fbda585	[CI skip] Merge pull request #2564 from Slimefun/gitlocalize-14181 ... Update pt-BR translations	2020-11-23 16:35:47 +01:00
TheBusyBiscuit	1ec4e67df4	[CI skip] Merge pull request #2565 from Slimefun/gitlocalize-14182 ... Updated pt translations	2020-11-23 16:35:21 +01:00
TheBusyBiscuit	4a6418cd7d	[CI skip] Updated translators list	2020-11-23 16:34:47 +01:00
Gustavo de Souza	bf06e2be83	Translate categories_pt.yml via GitLocalize	2020-11-23 12:36:03 +00:00
Mauricio Roberto	ac1788a98c	Translate researches_pt-BR.yml via GitLocalize	2020-11-23 12:35:09 +00: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
TheBusyBiscuit	8f3cad0419	[CI skip] Fixed two color codes related to the Elevator Plate	2020-11-19 18:06:17 +01:00
TheBusyBiscuit	8fab8268d4	[CI skip] Small change	2020-11-19 17:47:50 +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	c8d60ddc7b	Merge pull request #2494 from CURVX/fix/hopper-on-brew fixes #2447 ... Fixes brewing potion from Slimefun dusts using hopper	2020-11-19 14:46:39 +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	a18317295a	[CI skip] Refactoring	2020-11-19 12:45:35 +01:00
wzpzw5	024dbf4fc5	Update BlockPlacer.java	2020-11-18 01:37:54 +00:00
wzpzw5	d76f77cd84	Update BlockPlacer.java	2020-11-18 01:21:59 +00:00
wzpzw5	965e348695	Update BlockPlacer.java	2020-11-17 01:13:03 +00:00
wzpzw5	3db77a0081	Fixed a bug of Duplicate items with BlockPlacer ... Fixed a bug of Duplicate items with BlockPlacer's delay on BlockPlacer place an item, just take out the item when it place,then one in hand and another is placed	2020-11-17 00:01:04 +00: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