2816 Commits

Author	SHA1	Message	Date
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	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
TheBusyBiscuit	503dbc8367	Fixes #2418	2020-11-14 18:32:53 +01:00
CURVX	c4a08fe991	Changes req by TTB	2020-11-12 18:32:18 +05:30
TheBusyBiscuit	f1d4b50b67	One more tweak	2020-11-10 01:09:50 +01:00
TheBusyBiscuit	97cbe72a91	Some tweaks to the experimental bee wings	2020-11-10 01:04:15 +01:00
TheBusyBiscuit	e5b2924bee	Finished Bee Wings	2020-11-10 00:56:06 +01:00
TheBusyBiscuit	f3cf421f0e	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into bee-armor	2020-11-10 00:40:59 +01:00
TheBusyBiscuit	05e983917a	Added CoolerFeedPlayerEvent	2020-11-10 00:36:38 +01:00
TheBusyBiscuit	1d36ca82ba	Merge pull request #2522 from Slimefun/code-quality/abstract-classes ... Code quality: Getting rid of abstract energy classes	2020-11-10 00:11:50 +01:00
TheBusyBiscuit	dee7ded9cd	Merge pull request #2537 from Slimefun/gitlocalize-14021 ... fix of messenge_zh-TW	2020-11-08 23:40:14 +01:00
TheBusyBiscuit	4d00ffc9af	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into code-quality/abstract-classes	2020-11-05 00:08:04 +01:00
TheBusyBiscuit	933bd9d9b9	Merge branch 'code-quality/abstract-classes' of https://github.com/Slimefun/Slimefun4.git into code-quality/abstract-classes	2020-11-05 00:07:50 +01:00
TheBusyBiscuit	f8306f0693	Small addition	2020-11-05 00:07:37 +01:00
TheBusyBiscuit	3170f143a2	Added a config option to disable network visualizations	2020-11-04 11:18:06 +01:00
Wei-Liang Liou	b9f1e6d688	Translate messages_zh-TW.yml via GitLocalize	2020-11-04 10:08:41 +00:00
TheBusyBiscuit	b80d8cfeda	[CI skip] Updated translators	2020-11-03 18:28:08 +01:00
Wei-Liang Liou	b076d9ee64	Translate categories_zh-TW.yml via GitLocalize	2020-11-03 15:33:31 +00:00
TheBusyBiscuit	e7f7a4d392	Merge pull request #2462 from uiytt/canUnlockResearchEvent ... Added PlayerPreResearchEvent	2020-11-03 09:41:42 +01:00
uiytt	54ebfbb18c	Last formatting fix	2020-11-02 20:06:03 +01:00
TheBusyBiscuit	1c5f2f650b	Some refactoring and small fixes	2020-11-02 15:10:56 +01:00
TheBusyBiscuit	be001baa6e	[CI skip] Merge pull request #2508 from Sfiguz7/master ... Smallest documentation fix ever	2020-11-02 12:38:37 +01:00
Sfiguz7	22fd9e549f	Removed link from brewing stand	2020-11-02 01:04:53 +01:00
TheBusyBiscuit	25c3368ad3	Merge branch 'master' into code-quality/abstract-classes	2020-11-01 21:06:35 +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
HeroBrineKing	519140ede6	Translate resources_zh-TW.yml via GitLocalize	2020-10-31 11:50:41 +00:00
HeroBrineKing	36460ed11f	Translate researches_zh-TW.yml via GitLocalize	2020-10-31 11:50:40 +00:00
HeroBrineKing	7ecdbbc97d	Translate recipes_zh-TW.yml via GitLocalize	2020-10-31 11:50:39 +00:00
TheBusyBiscuit	935a36cfbd	Translate messages_zh-TW.yml via GitLocalize	2020-10-31 11:50:36 +00:00
HeroBrineKing	5fafac0f84	Translate categories_zh-TW.yml via GitLocalize	2020-10-31 11:50:35 +00:00
TheBusyBiscuit	3bf7dfc1c3	Update recipes_ko.yml	2020-10-31 10:17:59 +01:00
20181241	aa29c33625	Translate recipes_ko.yml via GitLocalize	2020-10-31 09:15:24 +00:00
TheBusyBiscuit	f2200cee44	[CI skip] Merge pull request #2516 from svr333/RenameMessage ... Change not-valid to invalid	2020-10-31 10:08:48 +01:00
TheBusyBiscuit	210c8d20f4	Fixes #2499	2020-10-30 22:50:16 +01:00
TheBusyBiscuit	24e344e219	Fixed compatibility	2020-10-30 19:58:31 +01:00
TheBusyBiscuit	a3fb6c044b	Fixed logging	2020-10-30 19:54:34 +01:00
TheBusyBiscuit	08d1def90c	Fixed a small mistake	2020-10-30 19:50:05 +01:00
TheBusyBiscuit	f197e26a9c	Did not mean to make this final yet	2020-10-30 19:42:58 +01:00
TheBusyBiscuit	508b5aa198	Refactored AGenerator	2020-10-30 19:37:39 +01:00
TheBusyBiscuit	d6567e4bfa	Refactored AContainer	2020-10-30 19:31:22 +01:00
svr333	33f0d0a4bc	Change not-valid to invalid	2020-10-29 15:06:52 +01:00
TheBusyBiscuit	12e7205280	[Ci skip] Added some unit tests	2020-10-28 12:52:23 +01:00
TheBusyBiscuit	28dda7caea	Merge pull request #2473 from CURVX/fix/armor-forge fixes #2469 ... Fixes ArmorForge	2020-10-28 12:15:34 +01:00
TheBusyBiscuit	6ad3b55e81	Merge pull request #2510 from Mooy1/Fix ... Fixes #2509	2020-10-28 12:14:52 +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
Mooy1	d8d98982b2	Update AContainer.java	2020-10-27 09:13:25 -05:00