2310 commits

Author	SHA1	Message	Date
Mrbysco	3ce53350bf	Generate item model for Crate Keeper using old texture	2024-03-07 00:42:39 +01:00
Mrbysco	c1ee118eda	Fix batbox rendering	2024-03-07 00:35:55 +01:00
Mrbysco	24763a46bc	Fix ItemEnergy	2024-03-07 00:18:32 +01:00
Flanks255	38f4824757	Sack finished i think? for now...	2024-03-06 12:59:34 -06:00
Mrbysco	e125e80e8c	Deprecate SmallerButton	2024-03-06 00:47:10 +01:00
Mrbysco	9f0a9926ac	Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4	2024-03-06 00:37:30 +01:00
Mrbysco	a85c67955c	Fix Smaller Button not rendering using the color of the message	2024-03-06 00:37:24 +01:00
Flanks255	f9df9226bf	Merge remote-tracking branch 'origin/1.20.4' into 1.20.4	2024-03-05 17:34:58 -06:00
Flanks255	edccaec7df	Auto pickup fixed	2024-03-05 17:34:48 -06:00
Mrbysco	3f49a259a1	Fix item filter title	2024-03-06 00:13:01 +01:00
Mrbysco	7e0e86744c	Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4	2024-03-06 00:10:50 +01:00
Mrbysco	7658fdaa4f	Initial booklet setup	2024-03-06 00:10:49 +01:00
Flanks255	d704c4a4ba	Merge remote-tracking branch 'origin/1.20.4' into 1.20.4	2024-03-05 17:03:03 -06:00
Flanks255	79c8bcfbd9	bysco plz help	2024-03-05 17:02:32 -06:00
Mrbysco	0c8b52a76f	Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4	2024-03-05 23:29:35 +01:00
Mrbysco	822913f047	Make Bio Reactor direactional and generate the blockstate	2024-03-05 23:29:23 +01:00
Flanks255	ccadf11e57	Merge remote-tracking branch 'origin/1.20.4' into 1.20.4	2024-03-05 16:23:58 -06:00
Flanks255	85725a0f85	misc wip sack fixes.	2024-03-05 16:23:49 -06:00
Mrbysco	c585fc993b	Remove a line of commented out code	2024-03-05 21:18:07 +01:00
Mrbysco	96992eb8cd	Remove old coffee machine category classes	2024-03-05 21:17:48 +01:00
Mrbysco	971fdd652f	Add Coffee Machine JEI category ... Create a recipe type replacement for CoffeeIngredient	2024-03-05 21:14:05 +01:00
Mrbysco	2f50f5ecfc	Move the JEI categories into folders	2024-03-05 17:36:42 +01:00
Mrbysco	bf4be2296a	Add tooltip to Powered Furnace	2024-03-05 17:34:16 +01:00
Mrbysco	ca3f84efae	Add the Powered Furnace as a catalyst for smelting recipes	2024-03-05 17:34:07 +01:00
Mrbysco	06de7536df	Fix error in packet handler	2024-03-05 17:29:16 +01:00
Mrbysco	abbc1ae90c	Make Black Quartz Ore drop the item directly unless silk touched	2024-03-05 17:11:22 +01:00
Mrbysco	97c7a96958	Adjust count to match vein size in AAWorldGen	2024-03-05 16:59:57 +01:00
Mrbysco	02422d6547	Generate Black Quartz	2024-03-05 16:58:45 +01:00
Mrbysco	899b2a982b	No need to use setShaderTexture as blit does that already	2024-03-05 16:06:51 +01:00
Mrbysco	041381830f	Fix Buttons rendering on mouse instead of at their position	2024-03-05 16:05:29 +01:00
Mrbysco	2cef8eb804	Fix double background being rendered in UI's	2024-03-05 16:04:21 +01:00
Mrbysco	87f753a1cc	Fix the durability bar on charge-able items	2024-03-05 15:50:07 +01:00
Flanks255	350da9b2b0	Fixed hand not swinging when putting items in display stands / empowerers in creative mode.	2024-03-04 17:03:33 -06:00
Mrbysco	b33faa124f	Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4	2024-03-04 23:44:28 +01:00
Mrbysco	99f670656c	Register the Capabilities to the blockentities and items that have them ... Also change the DeferredItem's to return the class of the item	2024-03-04 23:44:24 +01:00
Flanks255	8374a4d704	Laser fixes.	2024-03-04 16:33:15 -06:00
Mrbysco	f9897f0664	Fix ClientRegistryHandler being registered under the wrong bus	2024-03-04 22:55:09 +01:00
Mrbysco	02a6918267	Update CrushingRecipe.java	2024-03-04 22:52:10 +01:00
Mrbysco	50407e9524	Fix advancement gen	2024-03-04 22:50:27 +01:00
Mrbysco	ead1d9be58	Fix bucket model generation	2024-03-04 22:42:35 +01:00
Mrbysco	4a16be41c9	Don't register DungeonLoot to the event bus	2024-03-04 22:42:23 +01:00
Mrbysco	74688b9596	Remove unused imports	2024-03-04 22:38:59 +01:00
Flanks255	32d4b5a052	more fixes, it compiles	2024-03-04 15:37:11 -06:00
Flanks255	0b4c9838e9	Merge remote-tracking branch 'origin/1.20.4' into 1.20.4	2024-03-04 15:03:54 -06:00
Flanks255	610bf044ee	More Recipe fixes.	2024-03-04 15:03:46 -06:00
Mrbysco	5ac94e8fe4	Fix WorldData getter	2024-03-04 21:59:11 +01:00
Mrbysco	056ec5c1e0	Fix canola press container	2024-03-04 21:58:59 +01:00
Mrbysco	06bb77b7dd	Update BlockGreenhouseGlass.java	2024-03-04 21:57:36 +01:00
Mrbysco	b6d1fafa24	Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4	2024-03-04 21:54:17 +01:00
Mrbysco	f3efa570a4	Update TexturedButton.java	2024-03-04 21:54:00 +01:00