4709 Commits

Author	SHA1	Message	Date
TheBusyBiscuit	96f657f6e7	Small performance improvements	2021-04-05 13:16:31 +02:00
TheBusyBiscuit	bbd41ff70c	[CI skip] Fixed 24k carat gold ingot	2021-04-03 19:42:14 +02:00
TheBusyBiscuit	1955d1235b	[CI skip] Refactoring	2021-04-03 19:40:54 +02:00
TheBusyBiscuit	89b8b76fce	[CI skip] Refactoring... I said	2021-04-03 15:20:45 +02:00
TheBusyBiscuit	cb05563014	[CI skip] Refactoring ... + Removed unused class	2021-04-03 15:20:08 +02:00
TheBusyBiscuit	18139bb5c4	Fixed Grappling Hook vanishing in creative mode	2021-04-03 14:08:21 +02:00
TheBusyBiscuit	5e87df873c	Fixes #2926	2021-04-03 14:01:48 +02:00
TheBusyBiscuit	ee8d421189	Ancient Pedestals can now be found under "Magical Gadgets"	2021-03-31 19:13:21 +02:00
TheBusyBiscuit	ca3715a0dc	Added Crafting Motor (crafting ingredient for Auto-Crafters) ... Also retextured the Cargo Motor	2021-03-31 19:02:34 +02:00
TheBusyBiscuit	816cc0613b	Added "Slimeballs -> Slime Block" recipe to Electric Press	2021-03-31 18:31:59 +02:00
TheBusyBiscuit	61f0fa5d0d	Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git	2021-03-31 18:30:04 +02:00
TheBusyBiscuit	32c60ad5ac	[CI skip] Refactoring	2021-03-31 18:29:43 +02:00
TheBusyBiscuit	0ee724e1e5	Merge pull request #2919 from GallowsDove/master ... Fixed damageable items not respecting `unbreakable` tag	2021-03-31 17:20:50 +02:00
J3fftw	567b5397cf	Update src/main/resources/languages/messages_en.yml ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2021-03-31 15:36:19 +02:00
Jeffrey Kosse	5649f95174	Added a new message to multiblocks to see if inventory is empty	2021-03-31 14:37:24 +02:00
GallowsDove	ae7c22703e	requested changes	2021-03-29 20:39:55 +02:00
GallowsDove	062adb4cb7	Hopefully improved code	2021-03-28 22:49:45 +02:00
GallowsDove	7536f01145	Added unbreakable support for damageable items	2021-03-28 22:33:04 +02:00
TheBusyBiscuit	82366191b0	Merge pull request #2916 from Slimefun/fix/issue-2650 ... Fixed 2650	2021-03-28 15:03:58 +02:00
Daniel Walsh	526c2cc76c	Update src/main/resources/languages/researches_en.yml	2021-03-28 13:56:50 +01:00
Sfiguz7	7d92fe45b6	Gitlost I'm coming	2021-03-28 14:54:54 +02:00
Sfiguz7	25fd2120dc	FUCK YOU	2021-03-28 14:53:15 +02:00
Sfiguz7	07c0e88bec	Fuck the research_en file	2021-03-28 14:50:14 +02:00
TheBusyBiscuit	fb8c2ede7f	Merge branch 'master' into fix/issue-2650	2021-03-28 14:47:47 +02:00
Sfiguz7	78d1a8b21a	More merge conflicts	2021-03-28 14:45:03 +02:00
Sfiguz7	7ee4b98745	Resolved merge conflicts	2021-03-28 14:43:57 +02:00
Daniel Walsh	ec37fb142a	Requested changes	2021-03-28 13:26:57 +01:00
TheBusyBiscuit	9e2867870f	Added missing recipe	2021-03-28 14:22:19 +02:00
TheBusyBiscuit	95a2d9e385	Fixed Multimeter not working on Auto-Crafters	2021-03-28 14:18:43 +02:00
TheBusyBiscuit	2cf3ede10b	Fixed some concurrency issues	2021-03-28 11:44:47 +02:00
Daniel Walsh	488ffd951b	Fix test? (Im super tired... not sure why this didnt occur to me...)	2021-03-28 03:23:10 +01:00
Daniel Walsh	5283f02903	Fixes #2650	2021-03-28 03:16:50 +01:00
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	b64be98274	Added Unit Tests for disabling recipes	2021-03-27 22:34:23 +01: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
Daniel Walsh	f7352895ae	Merge pull request #2909 from RobotHanzo/master ... Fixes #2903	2021-03-27 17:14:40 +00:00
RobotHanzo	a7ee828209	Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/Crucible.java ... Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>	2021-03-28 00:47:20 +08:00
TheBusyBiscuit	6eb5235cf7	Automated Crafting Chamber is now disabled.	2021-03-27 11:55:00 +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	dba628f99c	[CI skip] Small performance optimization	2021-03-26 20:56:15 +01:00
RobotHanzo	50aaa08ccc	Update Crucible.java	2021-03-27 00:36:20 +08:00
RobotHanzo	af4d3a180e	Fixes #2903	2021-03-26 21:43:21 +08:00
Sfiguz7	5b5a2452a6	Small research cost balancing	2021-03-25 21:21:46 +01:00
Sfiguz7	b515fdbf1b	Filled researches.en, added capitalisation	2021-03-25 21:19:28 +01:00
Sfiguz7	12422a9da4	Misc research too	2021-03-25 21:08:35 +01:00
Sfiguz7	59c3f676e5	Added 2 missing researches	2021-03-25 20:57:28 +01:00