Commit graph

2786 commits

Author SHA1 Message Date
Mrbysco 226a439154 Update .gitignore 2024-03-04 23:05:21 +01:00
Mrbysco 33f5541192 Change license to MIT
See https://github.com/Ellpeck/ActuallyAdditions/issues/1391
2024-03-04 23:05:01 +01:00
Flanks255 59459b157c Merge remote-tracking branch 'origin/1.20.1' into 1.20.1 2024-03-04 13:17:16 -06:00
Flanks255 0e3fec76ce Small filter tweak before 1.20.4 2024-03-04 13:17:03 -06:00
Mrbysco 97532fff5b Mark tiny torch in port.md 2024-03-04 15:37:26 +01:00
Mrbysco 8236527fb7 Tiny Torch 2024-03-03 20:52:31 +01:00
Mrbysco c960149ca5 Rename invalid texture names 2024-03-03 19:02:53 +01:00
Mrbysco f8c2f53b6a Re-add JEI support 2024-03-03 19:02:05 +01:00
Mrbysco 7af0f214f0 Add localization for the fluid types 2024-03-03 19:01:51 +01:00
Mrbysco 3a48ccdcb3 Move the fluid textures so that Minecraft picks them up 2024-03-03 19:01:42 +01:00
Mrbysco 3586ce0ade Remove commented out reference to blockstate and itemmodel generation since we have that 2024-03-03 19:00:03 +01:00
Mrbysco 4a183f1555 Remove properties that were only needed in 1.16 2024-03-03 17:54:41 +01:00
Mrbysco 4596da2df5 Move the RecipeType DeferredRegister 2024-03-03 17:52:22 +01:00
Mrbysco 80fb2273b5 Datagen the DamageType 2024-03-03 17:49:29 +01:00
Mrbysco 4384c932f9 Deferred register the RecipeTypes 2024-03-03 17:48:28 +01:00
Mrbysco d376217781
Merge pull request #1390 from Mrbysco/1.20.1
Port to 1.20.1
2024-03-03 15:52:41 +01:00
Mrbysco 6133488eee Port to 1.20.1 2024-03-03 01:20:53 +01:00
Mrbysco 7c2e42dfcf Port to 1.18 2024-03-02 21:23:08 +01:00
Flanks255 69c362c41e Fixed dev environment multiplayer testing. 2024-01-06 18:04:30 -06:00
Flanks255 3edef49c04 Some sack fixes, other misc things. 2023-12-20 15:02:25 -06:00
Flanks255 457cf00a7b
Merge pull request #1389 from Mrbysco/1.16
Generate advancements
2023-12-03 15:16:04 -06:00
Mrbysco acef152961 Generate advancements
Still not all, but not sure all of them are still relevant
2023-12-03 15:41:58 +01:00
Flanks255 40f48f0e6c More Cleanup. 2023-12-02 07:49:10 -06:00
Flanks255 d4af87ceb3 Misc fixes 2023-11-26 16:10:19 -06:00
Flanks255 1fb8b80ee4 Cleaning up worms some more. 2023-05-15 19:23:26 -05:00
Flanks255 097803020c Fixed worms. 2023-05-12 21:20:26 -05:00
Flanks255 a75848e195 First pass at the sack, still wip. 2023-03-15 18:17:57 -05:00
Flanks255 0e1217b5d3 Fixed laser relays placement logic. 2023-01-19 14:45:14 -06:00
Flanks255 3634a3e71e
Merge pull request #1381 from Mrbysco/relay_pr
Re-enable the relays
2023-01-19 14:29:13 -06:00
Mrbysco 32008f113c Relays. 2023-01-19 16:27:56 +01:00
Flanks255 07a6da0948 🐌 2023-01-16 15:47:31 -06:00
Flanks255 e2fb8b12a9 fixed the worm. 2023-01-15 17:47:13 -06:00
Flanks255 72e29bf696 bysco fixes, no more worm errors... 2023-01-15 16:42:43 -06:00
Flanks255 db9b199d76 Updated Forge.
Updated JEI.
Fixed some log spam.
2023-01-15 15:46:42 -06:00
Flanks255 860215e7c1 Battery box stuff. 2023-01-15 11:14:29 -06:00
Flanks255 44effd2e7a Coffee fixes.
Batbox stuff.
2023-01-15 10:56:02 -06:00
Flanks255 6263e819ab Goggles. 2023-01-14 17:26:59 -06:00
Flanks255 a03036e9db Goggles. 2023-01-14 17:26:37 -06:00
Flanks255 8dd0e1a951 Leaf blowers are done. 2023-01-14 16:02:33 -06:00
Flanks255 750d2649c8 More missing recipes and lang entries. 2023-01-08 17:35:39 -06:00
Flanks255 44ab9291e7 Recipes and lang stuff... 2023-01-07 14:54:54 -06:00
Flanks255 d62d833178 Empowerer Plugin 2022-12-30 19:06:33 -06:00
Flanks255 177370a6a5 JEI Laser plugin. 2022-12-30 18:24:21 -06:00
Flanks255 90b1675764 more recipes. 2022-12-30 16:37:16 -06:00
Flanks255 215cd50608 some crafting recipes. 2022-12-29 18:02:38 -06:00
Michael Hillcox 9d6415e2f8 feat: added (wip) to all non-complete items 2022-11-06 21:17:56 +00:00
Flanks255 86a89a96a8 first pass at functional crusher. 2022-10-19 13:04:42 -05:00
Flanks255 04714de062 fixed furnace for now. 2022-10-19 12:15:46 -05:00
Flanks255 120721564e Crushers and furnaces keep energy.
Fixed crusher crash.
2022-10-19 09:57:56 -05:00
Flanks255 e8fee61c91 More tiles storing energy... 2022-10-14 18:58:04 -05:00