3166 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Flanks255	d9b0a714d1	renamed.	2024-10-23 17:22:22 -05:00
Flanks255	606177d002	Prepping for merge.	2024-10-23 17:05:52 -05:00
Mrbysco	7fd9c103fc	Change itemstack codec used by LaserRecipe	2024-10-23 16:15:12 +02:00
Mrbysco	718494a938	Fix coffee ingredient recipe using camel case for some keys	2024-10-23 15:55:32 +02:00
Mrbysco	5ac550f55f	Remove class related to food crafting ... Foods were removed	2024-10-23 15:51:09 +02:00
Mrbysco	f574925a47	Remove unused imports	2024-10-23 00:14:02 +02:00
Mrbysco	a414bc7ccc	Increment version	2024-10-22 23:11:59 +02:00
Mrbysco	5c4e584a73	Allow the Coffee Machine to consume water (Fixing #1422)	2024-10-22 23:07:22 +02:00
Mrbysco	90cecc8ed8	Don't add an effect multiple times	2024-10-22 23:01:57 +02:00
Mrbysco	0d27a4a304	Fix coffee not applying effects (See #1422)	2024-10-22 22:49:22 +02:00
Mrbysco	e91c1569ee	Fix tool check (Fixes #1421)	2024-10-22 22:33:33 +02:00
Mrbysco	16cd3a6966	Add Canola, Flax and Coffee patches ... Fix generateQuartz config option having the wrong id	2024-10-22 22:19:01 +02:00
Mrbysco	43a23883e3	Fix village structure	2024-10-22 19:48:54 +02:00
Mrbysco	d644baa4cc	Remove unused Buttons class	2024-10-22 19:22:50 +02:00
Mrbysco	f45bcb2f30	Remove unused Deprecated values	2024-10-22 19:22:25 +02:00
Mrbysco	7d5876a7ad	Remove GuiFactory as config is built into neoforge	2024-10-22 19:20:52 +02:00
Mrbysco	53b721f824	Remove unused OreDict related class	2024-10-22 19:17:51 +02:00
Mrbysco	268cf651d0	More cleaning up	2024-10-20 23:42:50 +02:00
Flanks255	6774b08ac5	Sunday code cleaning...	2024-10-20 15:58:07 -05:00
Flanks255	9cfbb61739	Merge remote-tracking branch 'origin/1.21' into 1.21	2024-10-19 17:08:58 -05:00
Flanks255	9a418c1c6d	Fixed all in one tools not having damage.	2024-10-19 17:08:46 -05:00
Mrbysco	b68cfecdf9	Add missing XP Solidifier recipe	2024-10-19 23:01:53 +02:00
Mrbysco	758001e2fd	Move init of ActuallyAdditionsClient inside the isClient check	2024-10-19 18:37:45 +02:00
Flanks255	b5cb343492	Added the ability to open the crafting table on a stick with a hotkey if the item is present in inventory, or in a curios slot. Closes #1417	2024-10-19 11:33:14 -05:00
Mrbysco	276c2dbd95	Increment version	2024-10-19 16:31:02 +02:00
Mrbysco	c952c779a4	Add more tags ( #1418 )	2024-10-19 16:21:25 +02:00
Mrbysco	9d166ac988	Networking overhaul ... Should fix #1419	2024-10-19 15:45:31 +02:00
Mrbysco	ecada0d3d9	Increment version	2024-10-18 23:39:12 +02:00
Mrbysco	3330a3b320	Update Buttons.java	2024-10-18 22:29:57 +02:00
Mrbysco	d088aba777	Remove comparison to self	2024-10-18 22:28:05 +02:00
Mrbysco	9abb4868d6	Update logging	2024-10-18 22:25:12 +02:00
Mrbysco	bae1ef5e91	Comment out logging oon ItemTeleportStaff	2024-10-18 22:23:38 +02:00
Mrbysco	e1e92d577a	Remove temporary log messages	2024-10-18 22:22:04 +02:00
Mrbysco	4dd12e74fd	Update package-info.java	2024-10-18 22:20:06 +02:00
Mrbysco	1e965230e5	Remove unused imports	2024-10-18 22:18:25 +02:00
Mrbysco	ae60e77a2c	Use tooltip context of Atomic Reconstructor (#1415)	2024-10-18 22:17:58 +02:00
Mrbysco	0ac1e81d0e	Increment version	2024-10-18 19:46:07 +02:00
Mrbysco	8fd9afe8d7	Separate client and server networking related code	2024-10-18 19:35:50 +02:00
Mrbysco	844efe4260	Fix server crashes on boot	2024-10-18 18:22:44 +02:00
Flanks255	f32f7187cc	Fixed project not loading for Flanks	2024-10-17 16:56:04 -05:00
Mrbysco	87a24eb19f	Increment version	2024-10-17 21:26:22 +02:00
Mrbysco	556fa487be	Fix Enervator and Energizer gui crashing	2024-10-17 21:17:23 +02:00
Mrbysco	6aceee7365	Increment version	2024-10-17 19:54:51 +02:00
Mrbysco	8fd600dc86	Fix energy storage	2024-10-17 19:54:11 +02:00
Mrbysco	e870e5c48b	Fix laser crash	2024-10-17 19:54:04 +02:00
Mrbysco	decfaef9c3	Update changelog.md	2024-10-17 19:14:07 +02:00
Mrbysco	27de160097	Increment version	2024-10-17 19:00:06 +02:00
Mrbysco	124cac11e4	Fix up Nether Wart farmer behavior	2024-10-17 18:53:49 +02:00
Mrbysco	d8ad92c447	Fix Empowered Emeradic Crystal requiring tall grass (Fixes #1410)	2024-10-17 18:39:43 +02:00
Mrbysco	a6a9467dd1	Fix Tiny Toch placement (Fixes #1409)	2024-10-17 18:35:11 +02:00