Commit Graph

Select branches

Hide Pull Requests

ah-OOG-ah/patchEnch

botania-null

efr-cocoon-of-caprice

feature/mana-tooltips

feature/schematics-refactor

gourmaryllisGTFood

master

milk-modded-cows

update-lexica-wiki-links

#1

#10

#100

#101

#103

#104

#105

#106

#107

#109

#11

#110

#112

#113

#113/merge

#116

#117

#119

#12

#120

#123

#123/merge

#124

#125

#126

#127

#127/merge

#128

#128/merge

#129

#13

#130

#130/merge

#131

#132

#133

#136

#137

#138

#138/merge

#14

#140

#142

#142/merge

#143

#144

#146

#147

#149

#15

#150

#151

#152

#154

#154/merge

#155

#156

#157

#158

#159

#16

#160

#161

#161/merge

#162

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#39

#4

#41

#42

#43

#44

#45

#46

#47

#49

#5

#51

#52

#53

#54

#55

#57

#6

#60

#61

#62

#64

#65

#66

#67

#68

#7

#75

#76

#78

#8

#81

#83

#84

#86

#87

#88

#89

#9

#91

#92

#93

#94

#95

#97

#98

#99

1.10.0-GTNH

1.10.1-GTNH

1.10.10-GTNH

1.10.11-GTNH

1.10.12-GTNH

1.10.13-GTNH

1.10.2-GTNH

1.10.3-GTNH

1.10.4-GTNH

1.10.5-GTNH

1.10.6-GTNH

1.10.7-GTNH

1.10.8-GTNH-pre

1.10.9-GTNH

1.11.0-GTNH

1.11.1-GTNH

1.11.2-GTNH-pre

1.11.3-GTNH

1.11.4-GTNH

1.11.5-GTNH

1.11.6-GTNH

1.11.7-GTNH

1.12.1-GTNH

1.12.10-GTNH

1.12.11-GTNH-pre

1.12.12-GTNH

1.12.13-GTNH-pre

1.12.14-GTNH-pre

1.12.15-GTNH-pre

1.12.16-GTNH

1.12.17-GTNH-pre

1.12.18-GTNH

1.12.19-GTNH-pre

1.12.2-GTNH

1.12.20-GTNH

1.12.21-GTNH

1.12.22-GTNH

1.12.23-GTNH

1.12.24-GTNH

1.12.25-GTNH

1.12.26-GTNH

1.12.27-GTNH

1.12.28-GTNH

1.12.3-GTNH

1.12.4-GTNH-pre

1.12.5-GTNH

1.12.6-GTNH

1.12.7-GTNH-pre

1.12.8-GTNH

1.12.9-GTNH-pre

1.13.0-GTNH

1.13.1-GTNH

1.13.10-GTNH

1.13.11-GTNH-pre

1.13.12-GTNH

1.13.13-GTNH-pre

1.13.14-GTNH

1.13.15-GTNH

1.13.16-GTNH

1.13.17-GTNH

1.13.18-GTNH-pre

1.13.19-GTNH

1.13.2-GTNH-pre

1.13.20-GTNH-pre

1.13.21-GTNH

1.13.22-GTNH-pre

1.13.23-GTNH-pre

1.13.24-GTNH-pre

1.13.25-GTNH

1.13.26-GTNH

1.13.27-GTNH

1.13.28-GTNH

1.13.29-GTNH

1.13.3-GTNH

1.13.30-GTNH

1.13.31-GTNH

1.13.32-GTNH

1.13.33-GTNH

1.13.34-GTNH

1.13.35-GTNH

1.13.36-GTNH

1.13.37-GTNH

1.13.38-GTNH

1.13.39-GTNH

1.13.4-GTNH

1.13.40-GTNH

1.13.41-GTNH

1.13.5-GTNH-pre

1.13.6-GTNH

1.13.7-GTNH-pre

1.13.8-GTNH

1.13.9-GTNH-pre

1.9.0-GTNH

1.9.1-GTNH

1.9.10-GTNH

1.9.11-GTNH

1.9.11-GTNH-pre

1.9.12-GTNH

1.9.13-GTNH

1.9.14-GTNH

1.9.15-GTNH

1.9.16-GTNH

1.9.17-GTNH

1.9.18-GTNH-pre

1.9.19-GTNH

1.9.2-GTNH

1.9.20-GTNH-pre

1.9.21-GTNH

1.9.22-GTNH

1.9.23-GTNH

1.9.24-GTNH

1.9.3-GTNH

1.9.4-GTNH

1.9.5-GTNH

1.9.6-GTNH

1.9.7-GTNH

1.9.8-GTNH

1.9.9-GTNH

V0.4-alpha

extStateDebug

jenkins-testtag

jenkins-testtag-2

r1.8-299

r1.8-300-ALPHA

r1.8-301

r1.8-302

r1.8-303

r1.8-304

r1.8-305

r1.8-306

r1.8-307

r1.8-308

r1.8-309

r1.8-310

r1.8-311

r1.8-312

r1.8-313

r1.8-314

r1.8-315

r1.8-316

r1.8-317

r1.8-318

r1.8-319

r1.8-320

r1.8-321

release-1.16-388

release-1.16-389

release-1.16-390

release-1.16-391

release-1.16-392

release-1.16-393

release-1.16-394

release-1.16-395

v0.1-alpha

v0.2-alpha

v0.3-alpha

v0.3.1-alpha

v0.3.2-alpha

v0.3.3-alpha

v0.4.1-alpha

v0.5-beta

v0.5.1-beta

v0.5.2-beta

v0.5.2.1-beta

v0.5.2.2-beta

v0.5.3-beta

v0.5.4-beta

v0.5.4.1-beta

v0.6-beta

v0.6.1-beta

v0.6.2-beta

v0.6.3-beta

v0.6.4-beta

v0.6.4.1-beta

v0.6.4.2-beta

Mono Color

• 2c97ee2981 Merge branch 'master' into update-lexica-wiki-links update-lexica-wiki-links Wilhelm Schuster 2026-10-26 11:18:48 +01:00
• 8c5c51e6fa Fix mana spreader entity ID leak (#162) master 1.13.41-GTNH Mikhail 2026-10-25 11:21:09 +01:00
• 37379acd3d Backport upstream commit to fix desyncs in statement of Elf Portal (#158) 1.13.40-GTNH Ressed 2026-10-25 16:11:37 +08:00
• 9307e94129 Merge branch 'master' into ah-OOG-ah/patchEnch ah-OOG-ah/patchEnch ah-OOG-ah 2026-10-20 22:52:05 -04:00
• d3f15b1e85 Update wiki for Lexica Botanica lookups Wilhelm Schuster 2026-10-15 21:59:06 +02:00
• 3f62d4b8fe Fix Cocoon of Caprice not rendering in inventory and NEI (#160) 1.13.39-GTNH Eldrinn Elantey 2026-10-11 20:48:07 +04:00
• 2257f1648c Fix NPE in NEI brewery handler when brew can't fill a container (#159) 1.13.38-GTNH slprime 2026-10-10 19:04:38 +03:00
• cefdfd7ca6 Fix Ring of Far Reach stacking reach on every dimension change (#157) 1.13.37-GTNH micvog 2026-10-04 09:20:27 +02:00
• c802a448e4 Fix identity assignment in TileSpreader (#155) 1.13.36-GTNH AlexSocol 2026-09-11 09:33:25 +03:00
• daae5de075 Add back deprecated constructor, mark it as such (#156) 1.13.35-GTNH Jason Mitchell 2026-09-10 23:26:22 -07:00
• b897e8485f Merge branch 'master' into ah-OOG-ah/patchEnch ah-OOG-ah 2026-09-02 07:58:00 -04:00
• 9edde0a4dc Drum of the Gathering gives the right product for modded cows milk-modded-cows koolkrafter5 2026-09-01 19:51:05 -04:00
• abd62c1076 Cache slab unlocalized name (#152) 1.13.34-GTNH boubou19 2026-08-25 10:55:50 +02:00
• 6b5a1bbc31 Merge branch 'master' into ah-OOG-ah/patchEnch ah-OOG-ah 2026-08-08 22:56:10 -04:00
• 8e709b0190 fix: use renderViewEntity instead of player for rendering (#151) 1.13.33-GTNH Caedis 2026-08-08 00:44:58 -05:00
• d0b9a26957 Merge branch 'master' into ah-OOG-ah/patchEnch ah-OOG-ah 2026-08-05 14:04:14 -04:00
• a16181c480 add null check for explosionsource (#150) 1.13.32-GTNH Ben 2026-08-04 21:00:33 +01:00
• 9f9c413b48 update+deps+gradle+bs 1.13.31-GTNH botania-null Dream Master 2026-08-04 11:32:51 +07:00
• 37a43412d1 Merge branch 'master' into ah-OOG-ah/patchEnch ah-OOG-ah 2026-08-03 14:50:30 -04:00
• 31eb7b3516 Fix render allocations (#149) boubou19 2026-08-03 20:11:04 +02:00
• a7f8f1cbac Merge branch 'master' into ah-OOG-ah/patchEnch ah-OOG-ah 2026-08-02 20:56:03 -04:00
• d213b7bf0a Pottable flowers and mushrooms (#146) 1.13.30-GTNH FourIsTheNumber 2026-08-02 20:15:00 -04:00
• 104a6183d3 Merge branch 'master' into ah-OOG-ah/patchEnch ah-OOG-ah 2026-08-02 14:50:32 -04:00
• c168882a48 Cache reflection (#147) 1.13.29-GTNH boubou19 2026-08-02 16:52:34 +02:00
• 590485f8f3 Remove stub comment ah-OOG-ah 2026-07-28 23:56:19 -04:00
• 9beb60183b Convert spaces back to tabs ah-OOG-ah 2026-07-28 23:52:19 -04:00
• 1175f3a5c5 Merge branch 'master' into ah-OOG-ah/patchEnch ah-OOG-ah 2026-07-28 23:41:10 -04:00
• 073ae658b5 Improve the NEI handler for the Botanical Brewery (#144) 1.13.28-GTNH Nikolay S. 2026-07-26 10:08:12 -05:00
• a165099e39 Merge branch 'master' into ah-OOG-ah/patchEnch ah-OOG-ah 2026-07-17 02:52:36 -04:00
• 0e88bd8a9c Implement ColorUtils class to NEI handler (#143) 1.13.27-GTNH Ranzu 2026-07-17 05:24:11 +02:00
• 71c6c71281 Merge branch 'master' into ah-OOG-ah/patchEnch ah-OOG-ah 2026-07-16 08:32:49 -04:00
• 632d1b559e Add Mana info tooltips for pools, spreaders and flowers feature/mana-tooltips Eldrinn-Elantey 2026-07-10 06:48:35 +04:00
• 9d1709dd74 Delete Botania Contributing.md (#140) 1.13.26-GTNH UltraProdigy 2026-07-04 14:46:27 -04:00
• 56aaa823b2 Merge branch 'master' into ah-OOG-ah/patchEnch ah-OOG-ah 2026-06-09 22:58:28 -04:00
• ffdce1834c Clean up NEI handlers (#131) 1.13.25-GTNH koolkrafter5 2026-06-04 13:06:36 -04:00
• 2aa954918f Enhance switch statement ah-OOG-ah 2026-06-03 01:14:35 -04:00
• cf57347284 Use GTNHLib method over vanilla one ah-OOG-ah 2026-06-03 01:02:59 -04:00
• 9e1e20cd42 Directly return the Iterable 1.13.24-GTNH-pre koolkrafter5 2026-06-02 18:11:18 -04:00
• dc0ecf382b Use reassignmnent here too koolkrafter5 2026-06-02 18:05:30 -04:00
• d9940264f5 Remove reference to getRecipeID koolkrafter5 2026-06-02 17:57:56 -04:00
• afa5ba13a2 Use constructors intelligently koolkrafter5 2026-06-02 17:56:39 -04:00
• 48b03707bb Remove extra parens koolkrafter5 2026-06-02 17:52:52 -04:00
• 6bef147998 Configure jvmdg to use gtnhlib stubs koolkrafter5 2026-06-02 17:52:40 -04:00
• f2fd81e78d Remove redundant null check koolkrafter5 2026-06-02 17:49:14 -04:00
• 5863743e31 Use reassignments when making these PositionedStacks 1.13.23-GTNH-pre koolkrafter5 2026-05-29 20:59:10 -04:00
• 87bad36550 Clean up apothecary and runic handler center items koolkrafter5 2026-05-29 20:41:36 -04:00
• 33490aa266 Modify pure daisy to single ingredient and remove unused otherStacks koolkrafter5 2026-05-29 20:41:02 -04:00
• c1bac66d2a Use positionedStackContainsWithNBT koolkrafter5 2026-05-29 20:24:36 -04:00
• 5e59b54f97 Remove unused import koolkrafter5 2026-05-29 20:24:06 -04:00
• b82655ed64 Fix name for renderItemIntoGUI param koolkrafter5 2026-05-29 20:23:56 -04:00
• 2be7ea42a8 Cache these catalysts and rename other cached item stacks koolkrafter5 2026-05-29 20:23:38 -04:00
• 3848b29049 Narrow regex koolkrafter5 2026-05-29 20:13:07 -04:00
• 461bed9235 Fix name for consistency koolkrafter5 2026-05-29 20:12:09 -04:00
• a1a073d24f Clean elven trade handler koolkrafter5 2026-05-28 15:05:50 -04:00
• f164e3843d Use jvmdg and fix tiara easter egg. JAXB was removed from the standard jdk and using SecureRandom before comparing against a static hash was broken. I needed to make a new solution for it, see the comment on onEquipped. koolkrafter5 2026-05-28 15:01:28 -04:00
• 96f3f498fb Clean brewery handler koolkrafter5 2026-05-28 12:36:58 -04:00
• 63c2b39207 Fix server crash 1.13.22-GTNH-pre koolkrafter5 2026-03-21 01:53:49 -04:00
• 5656619999 Fix crash with Alfheim mod by working around stupid decisions made a decade ago koolkrafter5 2026-03-21 00:53:50 -04:00
• f5ec5fb95f Clean up pure daisy handler. Add helper method to render items. koolkrafter5 2026-03-20 22:48:16 -04:00
• d8b9f5bb11 Clean up apothecary and runic altar handlers. Remove the altars from the recipe ingredients and add seeds/livingrock. koolkrafter5 2026-03-20 22:13:30 -04:00
• 64795d2cf6 Move duplicate references to helper class and clean up string display koolkrafter5 2026-03-20 21:39:57 -04:00
• 9fca30df29 Clean up mana pool handler and make the transfer rect actually work by just rendering the mana pool item rather than adding it as an itemstack koolkrafter5 2026-03-20 19:52:20 -04:00
• 95ef44f43c Clean up lexica info handler, make the transfer rect actually work by just rendering the lexica item rather than adding it as an itemstack, and show information when looking both for recipes and usages koolkrafter5 2026-03-20 18:57:15 -04:00
• aa7508a1d3 Clean up floating flower handler and let it work with the inventory crafting grid koolkrafter5 2026-03-20 18:25:07 -04:00
• 992a319a3b Clean up elven trade handler and replace stream with loop koolkrafter5 2026-03-20 18:10:56 -04:00
• b0429f7b82 Clean up brewery handler and show usable brew containers as catalysts koolkrafter5 2026-03-20 17:34:05 -04:00
• e8f70bb391 Remove deprecated recipiesPerPage koolkrafter5 2026-03-20 17:27:56 -04:00
• f180c9530c Remove commented out pointless elven knowledge check koolkrafter5 2026-03-20 17:25:07 -04:00
• 8615546dc4 Remove deprecated getCycledIngredients koolkrafter5 2026-03-20 17:23:23 -04:00
• 3fa2240e61 Added size parameter to lang file (#137) 1.13.21-GTNH Ranzu 2026-05-25 19:15:30 +02:00
• d81df81feb Merge remote-tracking branch 'origin/nei' into dev 1.13.20-GTNH-pre Martin Robertz 2026-05-21 22:34:43 +02:00
• e344c7e86c Merge remote-tracking branch 'origin/master' into dev Martin Robertz 2026-05-21 22:34:31 +02:00
• 3c70f6426f Merge branch 'master' into nei Martin Robertz 2026-05-20 11:28:32 +02:00
• ec99a884b6 fix three world leaks in TESR (#136) 1.13.19-GTNH Alexdoru 2026-05-18 18:47:11 +02:00
• cd83ce621d Merge remote-tracking branch 'origin/nei' into dev 1.13.18-GTNH-pre Martin Robertz 2026-05-07 19:10:52 +02:00
• 944aec7441 update+gradle+deps+bs 1.13.17-GTNH Martin Robertz 2026-05-07 19:09:48 +02:00
• e95504c504 Merge branch 'master' into nei koolkrafter5 2026-05-06 06:50:55 -04:00
• 9d677e7734 Fix Ring of Mantle re-applying Haste every tick (#133) guneykabelandguneykabel 2026-05-06 06:09:50 +00:00
• f58f6f4754 Fix server crash koolkrafter5 2026-03-21 01:53:49 -04:00
• 6f903ab7de Fix crash with Alfheim mod by working around stupid decisions made a decade ago koolkrafter5 2026-03-21 00:53:50 -04:00
• 209101aa95 Clean up pure daisy handler. Add helper method to render items. koolkrafter5 2026-03-20 22:48:16 -04:00
• aada712207 Clean up apothecary and runic altar handlers. Remove the altars from the recipe ingredients and add seeds/livingrock. koolkrafter5 2026-03-20 22:13:30 -04:00
• 9ee9b771c5 Move duplicate references to helper class and clean up string display koolkrafter5 2026-03-20 21:39:57 -04:00
• fac6a36248 Clean up mana pool handler and make the transfer rect actually work by just rendering the mana pool item rather than adding it as an itemstack koolkrafter5 2026-03-20 19:52:20 -04:00
• 63a0f35d54 Clean up lexica info handler, make the transfer rect actually work by just rendering the lexica item rather than adding it as an itemstack, and show information when looking both for recipes and usages koolkrafter5 2026-03-20 18:57:15 -04:00
• e150175b3d Clean up floating flower handler and let it work with the inventory crafting grid koolkrafter5 2026-03-20 18:25:07 -04:00
• b4f98d7b7c Clean up elven trade handler and replace stream with loop koolkrafter5 2026-03-20 18:10:56 -04:00
• 335bbcdd4b Clean up brewery handler and show usable brew containers as catalysts koolkrafter5 2026-03-20 17:34:05 -04:00
• ffcb1bf891 Remove deprecated recipiesPerPage koolkrafter5 2026-03-20 17:27:56 -04:00
• 548286802a Remove commented out pointless elven knowledge check koolkrafter5 2026-03-20 17:25:07 -04:00
• 730ccfec4b Remove deprecated getCycledIngredients koolkrafter5 2026-03-20 17:23:23 -04:00
• 5b7a5f15e3 format gourmaryllisGTFood yoshy2002 2026-03-17 13:10:06 +01:00
• a71dd19fc2 not be 40 gt versions behind yoshy2002 2026-03-15 20:50:44 +01:00
• aa030e651c add ability to consume GT Food to Gourmaryllis yoshy2002 2026-03-15 20:45:54 +01:00
• 0852f91ba7 Update dep&bs (#126) 1.13.16-GTNH UltraProdigy 2026-03-07 04:34:46 -05:00
• 38845602a9 Optimize Image & Workflow (#125) UltraProdigy 2026-03-07 03:39:25 -05:00
• 4878e88fce GuiTitles Localization (#124) 1.13.15-GTNH Ranzu 2026-02-22 21:38:00 +01:00
• fa850857e8 Refactor: tiered tool interface (#103) 1.13.14-GTNH 4 people 2026-02-05 18:50:27 +01:00
• 812723532a Merge remote-tracking branch 'origin/master' into dev 1.13.13-GTNH-pre Martin Robertz 2026-01-30 10:42:09 +01:00
• e0a0b1ec53 fix typos (#120) 1.13.12-GTNH YoshyandRuling-0 2026-01-29 21:14:14 +01:00