Commit graph

Select branches

Hide pull requests

1.10.2

1.11.2

1.12.2

1.14-rewrite

1.16

1.20.1

1.20.4

1.7.10

1.8.9

1.9

1.9.4

clean-start

main

#1

#100

#100

#1006

#102

#1030

#1030

#1032

#1057

#1059

#1059

#1060

#1060

#1079

#1097

#1097

#1107

#1112

#1112

#1213

#1216

#1227

#1229

#1231

#1234

#1240

#1279

#1285

#1286

#1289

#1292

#1293

#1294

#1297

#1301

#1316

#1334

#1340

#1343

#1345

#1346

#1347

#1355

#1372

#1372

#1374

#1377

#1380

#1380

#1381

#1383

#1389

#1390

#1393

#1393

#1395

#1396

#1398

#156

#159

#16

#17

#18

#185

#189

#192

#199

#2

#26

#261

#264

#27

#28

#29

#294

#3

#306

#318

#33

#33

#340

#350

#355

#355

#36

#37

#38

#38

#39

#4

#40

#42

#43

#44

#45

#462

#477

#48

#483

#49

#496

#5

#500

#522

#523

#529

#530

#555

#558

#56

#560

#560

#57

#60

#604

#611

#622

#636

#638

#643

#658

#66

#67

#68

#686

#691

#693

#702

#704

#711

#716

#72

#73

#756

#756

#757

#757

#762

#8

#803

#825

#83

#835

#836

#836

#837

#837

#838

#841

#844

#847

#850

#851

#852

#857

#859

#865

#868

#926

#926

#93

#934

#937

#937

#955

#965

#966

#976

#986

#99

Mono Color

• 3f49a259a1 Fix item filter title Mrbysco 2024-03-06 00:13:01 +0100
• 7e0e86744c Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4 Mrbysco 2024-03-06 00:10:50 +0100
• 7658fdaa4f Initial booklet setup Mrbysco 2024-03-06 00:10:49 +0100
• 654465b39e Add Patchouli and Patchouli Provider Mrbysco 2024-03-06 00:10:42 +0100
• d704c4a4ba Merge remote-tracking branch 'origin/1.20.4' into 1.20.4 Flanks255 2024-03-05 17:03:03 -0600
• 79c8bcfbd9 bysco plz help Flanks255 2024-03-05 17:02:32 -0600
• 0c8b52a76f Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4 Mrbysco 2024-03-05 23:29:35 +0100
• 822913f047 Make Bio Reactor direactional and generate the blockstate Mrbysco 2024-03-05 23:29:23 +0100
• ccadf11e57 Merge remote-tracking branch 'origin/1.20.4' into 1.20.4 Flanks255 2024-03-05 16:23:58 -0600
• 85725a0f85 misc wip sack fixes. Flanks255 2024-03-05 16:23:49 -0600
• c585fc993b Remove a line of commented out code Mrbysco 2024-03-05 21:18:07 +0100
• 96992eb8cd Remove old coffee machine category classes Mrbysco 2024-03-05 21:17:48 +0100
• 971fdd652f Add Coffee Machine JEI category Mrbysco 2024-03-05 21:14:05 +0100
• 2f50f5ecfc Move the JEI categories into folders Mrbysco 2024-03-05 17:36:42 +0100
• bf4be2296a Add tooltip to Powered Furnace Mrbysco 2024-03-05 17:34:16 +0100
• ca3f84efae Add the Powered Furnace as a catalyst for smelting recipes Mrbysco 2024-03-05 17:34:07 +0100
• 06de7536df Fix error in packet handler Mrbysco 2024-03-05 17:29:16 +0100
• abbc1ae90c Make Black Quartz Ore drop the item directly unless silk touched Mrbysco 2024-03-05 17:11:22 +0100
• 97c7a96958 Adjust count to match vein size in AAWorldGen Mrbysco 2024-03-05 16:59:57 +0100
• 02422d6547 Generate Black Quartz Mrbysco 2024-03-05 16:58:45 +0100
• 899b2a982b No need to use setShaderTexture as blit does that already Mrbysco 2024-03-05 16:06:51 +0100
• 041381830f Fix Buttons rendering on mouse instead of at their position Mrbysco 2024-03-05 16:05:29 +0100
• 2cef8eb804 Fix double background being rendered in UI's Mrbysco 2024-03-05 16:04:21 +0100
• 87f753a1cc Fix the durability bar on charge-able items Mrbysco 2024-03-05 15:50:07 +0100
• 350da9b2b0 Fixed hand not swinging when putting items in display stands / empowerers in creative mode. Flanks255 2024-03-04 17:03:33 -0600
• b33faa124f Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4 Mrbysco 2024-03-04 23:44:28 +0100
• 99f670656c Register the Capabilities to the blockentities and items that have them Mrbysco 2024-03-04 23:44:24 +0100
• 8374a4d704 Laser fixes. Flanks255 2024-03-04 16:33:15 -0600
• 226a439154 Update .gitignore 1.20.1 Mrbysco 2024-03-04 23:05:21 +0100
• 33f5541192 Change license to MIT Mrbysco 2024-03-04 23:04:53 +0100
• 717199ea88 Change license to MIT Mrbysco 2024-03-04 23:04:53 +0100
• f9897f0664 Fix ClientRegistryHandler being registered under the wrong bus Mrbysco 2024-03-04 22:55:09 +0100
• dcc2220a28 Run datagen Mrbysco 2024-03-04 22:52:17 +0100
• 02a6918267 Update CrushingRecipe.java Mrbysco 2024-03-04 22:52:10 +0100
• 50407e9524 Fix advancement gen Mrbysco 2024-03-04 22:50:27 +0100
• ead1d9be58 Fix bucket model generation Mrbysco 2024-03-04 22:42:35 +0100
• 4a16be41c9 Don't register DungeonLoot to the event bus Mrbysco 2024-03-04 22:42:23 +0100
• d49d29b7e9 Trailing comma Mrbysco 2024-03-04 22:39:16 +0100
• 74688b9596 Remove unused imports Mrbysco 2024-03-04 22:38:59 +0100
• 32d4b5a052 more fixes, it compiles Flanks255 2024-03-04 15:37:11 -0600
• 0b4c9838e9 Merge remote-tracking branch 'origin/1.20.4' into 1.20.4 Flanks255 2024-03-04 15:03:54 -0600
• 610bf044ee More Recipe fixes. Flanks255 2024-03-04 15:03:46 -0600
• 5ac94e8fe4 Fix WorldData getter Mrbysco 2024-03-04 21:59:11 +0100
• 056ec5c1e0 Fix canola press container Mrbysco 2024-03-04 21:58:59 +0100
• 06bb77b7dd Update BlockGreenhouseGlass.java Mrbysco 2024-03-04 21:57:36 +0100
• b6d1fafa24 Merge branch '1.20.4' of https://github.com/Ellpeck/ActuallyAdditions into 1.20.4 Mrbysco 2024-03-04 21:54:17 +0100
• f3efa570a4 Update TexturedButton.java Mrbysco 2024-03-04 21:54:00 +0100
• c866a404ea Merge remote-tracking branch 'origin/1.20.4' into 1.20.4 Flanks255 2024-03-04 14:50:46 -0600
• 576d463441 Recipe Stuffs Flanks255 2024-03-04 14:50:33 -0600
• c2bcbfe56f Rest of the tiles done Mrbysco 2024-03-04 21:38:02 +0100
• ebaae73dad Adding my util classes Flanks255 2024-03-04 13:38:11 -0600
• 00418d267f Small filter tweak Flanks255 2024-03-04 13:36:26 -0600
• 63fbbb334e Unfinished port to 1.20.4 Neo Mrbysco 2024-03-04 20:21:48 +0100
• 59459b157c Merge remote-tracking branch 'origin/1.20.1' into 1.20.1 Flanks255 2024-03-04 13:17:16 -0600
• 0e3fec76ce Small filter tweak before 1.20.4 Flanks255 2024-03-04 13:17:03 -0600
• 97532fff5b Mark tiny torch in port.md Mrbysco 2024-03-04 15:37:26 +0100
• 8236527fb7 Tiny Torch Mrbysco 2024-03-03 20:52:31 +0100
• c960149ca5 Rename invalid texture names Mrbysco 2024-03-03 19:02:53 +0100
• f8c2f53b6a Re-add JEI support Mrbysco 2024-03-03 19:02:05 +0100
• 7af0f214f0 Add localization for the fluid types Mrbysco 2024-03-03 19:01:51 +0100
• 3a48ccdcb3 Move the fluid textures so that Minecraft picks them up Mrbysco 2024-03-03 19:01:42 +0100
• 3586ce0ade Remove commented out reference to blockstate and itemmodel generation since we have that Mrbysco 2024-03-03 19:00:03 +0100
• 4a183f1555 Remove properties that were only needed in 1.16 Mrbysco 2024-03-03 17:54:41 +0100
• 4596da2df5 Move the RecipeType DeferredRegister Mrbysco 2024-03-03 17:52:22 +0100
• 80fb2273b5 Datagen the DamageType Mrbysco 2024-03-03 17:49:29 +0100
• 4384c932f9 Deferred register the RecipeTypes Mrbysco 2024-03-03 17:48:28 +0100
• d376217781
  Merge pull request #1390 from Mrbysco/1.20.1 Mrbysco 2024-03-03 15:52:41 +0100
• 6133488eee Port to 1.20.1 Mrbysco 2024-03-03 01:20:53 +0100
• 7c2e42dfcf Port to 1.18 Mrbysco 2024-03-02 21:23:08 +0100
• 7758a95031
  Merge e2c40b9594 into 69c362c41e hexax 2024-01-14 20:13:31 -0700
• 69c362c41e Fixed dev environment multiplayer testing. 1.16 Flanks255 2024-01-06 18:04:30 -0600
• 3edef49c04 Some sack fixes, other misc things. Flanks255 2023-12-20 15:02:25 -0600
• 457cf00a7b
  Merge pull request #1389 from Mrbysco/1.16 Flanks255 2023-12-03 15:16:04 -0600
• acef152961 Generate advancements Mrbysco 2023-12-03 15:41:58 +0100
• 40f48f0e6c More Cleanup. Flanks255 2023-12-02 07:49:10 -0600
• d4af87ceb3 Misc fixes Flanks255 2023-11-26 16:10:19 -0600
• 737a7d3d54
  Update specialPeopleStuff.properties main Ell 2023-11-15 11:49:53 +0100
• 1fb8b80ee4 Cleaning up worms some more. Flanks255 2023-05-15 19:23:26 -0500
• 097803020c Fixed worms. Flanks255 2023-05-12 21:20:26 -0500
• a75848e195 First pass at the sack, still wip. Flanks255 2023-03-15 18:17:57 -0500
• f404183d54
  Update specialPeopleStuff.properties Ell 2023-03-08 12:48:22 +0100
• 729ab8f041
  Merge 65fd73854e into 0e1217b5d3 Yarin Levi 2023-01-29 04:46:46 +0100
• 0e1217b5d3 Fixed laser relays placement logic. Flanks255 2023-01-19 14:45:14 -0600
• 3634a3e71e
  Merge pull request #1381 from Mrbysco/relay_pr Flanks255 2023-01-19 14:29:13 -0600
• 32008f113c Relays. Mrbysco 2023-01-19 16:27:56 +0100
• 07a6da0948 🐌 Flanks255 2023-01-16 15:47:31 -0600
• e2fb8b12a9 fixed the worm. Flanks255 2023-01-15 17:47:13 -0600
• 72e29bf696 bysco fixes, no more worm errors... Flanks255 2023-01-15 16:42:43 -0600
• db9b199d76 Updated Forge. Updated JEI. Fixed some log spam. Flanks255 2023-01-15 15:46:42 -0600
• 860215e7c1 Battery box stuff. Flanks255 2023-01-15 11:14:29 -0600
• 44effd2e7a Coffee fixes. Batbox stuff. Flanks255 2023-01-15 10:56:02 -0600
• 6263e819ab Goggles. Flanks255 2023-01-14 17:26:59 -0600
• a03036e9db Goggles. Flanks255 2023-01-14 17:26:37 -0600
• 8dd0e1a951 Leaf blowers are done. Flanks255 2023-01-14 16:02:33 -0600
• 750d2649c8 More missing recipes and lang entries. Flanks255 2023-01-08 17:35:39 -0600
• 44ab9291e7 Recipes and lang stuff... Flanks255 2023-01-07 14:54:54 -0600
• d62d833178 Empowerer Plugin Flanks255 2022-12-30 19:06:33 -0600
• 177370a6a5 JEI Laser plugin. Flanks255 2022-12-30 18:24:21 -0600
• 90b1675764 more recipes. Flanks255 2022-12-30 16:37:16 -0600
• 215cd50608 some crafting recipes. Flanks255 2022-12-29 18:02:38 -0600