Commit Graph

Select branches

Hide Pull Requests

Ranzu/Dashboard

ah-OOG-ah/patchEnch

botania-null

efr-cocoon-of-caprice

feature/mana-tooltips

feature/schematics-refactor

gourmaryllisGTFood

master

milk-modded-cows

release/2.9.x

update-lexica-wiki-links

visibility-controls

#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

#128

#128/merge

#129

#13

#130

#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

#163

#164

#165

#165/merge

#166

#166/merge

#167

#167/merge

#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.42-GTNH

1.13.43-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.14.0-GTNH

1.14.1-GTNH

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

• 3ddde7141f Revert banner/shield textures Vincent Lee 2020-04-05 12:21:53 -05:00
• a9dace4706 Warn on all missing recipes in patchouli components Vincent Lee 2020-04-05 12:03:00 -05:00
• 72bcd9f42b Delete registerRecipeEvent Vincent Lee 2020-04-05 11:58:07 -05:00
• f9e960a907 Make head recipe stateless, and use inventory-sensitive output method for all rune altar/apothecary recipes Vincent Lee 2020-04-05 11:57:05 -05:00
• dc8b74f657 Add recipe id tooltip to JEI recipes Hubry 2020-04-05 18:43:09 +02:00
• 7f8429462a Fix lexicon brewing and elven trade recipes Hubry 2020-04-05 17:47:44 +02:00
• 101fbb2a1c Fix a field->getter i missed last commit Vincent Lee 2020-04-05 00:53:13 -05:00
• 38cb6bf279 Reformat Vincent Lee 2020-04-05 00:33:14 -05:00
• 2eb14c45eb Merge 1.14, and clean up some unused AT entries. Vincent Lee 2020-04-05 00:32:21 -05:00
• 573a8fe9d1 Write the changelog and paste the one that somehow never got committed Vincent Lee 2020-04-05 00:06:41 -05:00
• 6a6af55358 Build Vincent Lee 2020-04-04 23:56:39 -05:00
• 37f60f05a5 Fix #3225 hopefully. My workspace is broken so I can't test Vincent Lee 2020-04-04 18:46:09 -05:00
• 43337b723d recieve Vincent Lee 2020-04-04 12:52:35 -05:00
• 0f2c8d61b6 Fix #3228 (finally) Vincent Lee 2020-04-04 12:48:52 -05:00
• f8d7a2ad11 Fix mutated island being yeeted Vincent Lee 2020-04-04 12:18:52 -05:00
• 97bb8c1c8f Fix doc derp Vincent Lee 2020-04-04 12:17:13 -05:00
• 94ff98de27 Fix banner/shield textures, mostly Vincent Lee 2020-04-03 19:58:12 -05:00
• 9b9e6fc21d Beta build Vincent Lee 2020-04-03 19:26:40 -05:00
• 8df91b07cc Document apiVersion and reset it to 1 since everything changed Vincent Lee 2020-04-03 19:22:22 -05:00
• 0bfbaad6ff Move cap objects out of API since they don't like being there Vincent Lee 2020-04-03 19:19:48 -05:00
• 8e4666918f Migrate botaniaAPI and botaniaAPIClient to interface. Rework IMC to not rely on API. Vincent Lee 2020-04-03 18:58:42 -05:00
• ba943c8158 Update contributors.properties Vasco Lavos 2020-04-04 00:13:37 +01:00
• b14a964b1e More cleanups. Fix typo in CorporeaHelper classname, reformat Vincent Lee 2020-04-03 17:08:44 -05:00
• 0c04fa30b1 Move ShaderCallback into mod, remove BotaniaStateProps.POWERED in favor of vanilla equivalent Vincent Lee 2020-04-03 16:54:32 -05:00
• 4a63807d09 Major API cleanup for corporea. Closes #3173 Vincent Lee 2020-04-03 16:48:07 -05:00
• 272ef5bbab Start API cleanup: Move ManaItemHandler to an interface implemented in the mod proper. Also move ColorHelper into mod proper. Vincent Lee 2020-04-03 15:24:09 -05:00
• 54cdb17809 Fix belt, cloak, terrasteel will renders Vincent Lee 2020-04-02 13:58:33 -05:00
• 8984cecb89 Fix apothecary fluid render. It turns out i am not smart. Closes #3206 Vincent Lee 2020-04-02 12:56:59 -05:00
• 18367ee721 Fix body cosmetics Vincent Lee 2020-03-31 21:49:47 -05:00
• 3c2c82b668 Fix all head cosmetics. Blue butterfly texture changed so axis of rotation is down the middle of the texture bc that makes the GL easier :V Vincent Lee 2020-03-31 20:55:02 -05:00
• 3a8170ded0 Don't enforce formatting checks for building, should fix maven builds? Hubry 2020-03-31 17:00:33 +02:00
• 74b358f127 Hide the elven return recipes again, unhide and fix lexicon trade recipe Hubry 2020-03-31 15:07:23 +02:00
• ef796e5311 Remove allocation-heavy method in alfportal Vincent Lee 2020-03-30 23:25:40 -05:00
• 6c99e4e19a Reformat Vincent Lee 2020-03-30 23:08:22 -05:00
• c9cc1c615a Gog orechid recipe, yeet kanade config Vincent Lee 2020-03-30 23:08:05 -05:00
• 55c67c799f Fix lexicon, other bugs Vincent Lee 2020-03-30 22:33:09 -05:00
• af9b77e0ea Fix more bugs, rename petal and rune recipe folders Vincent Lee 2020-03-30 22:10:10 -05:00
• 5d04baf7d7 Fix missing write in petal serializer Vincent Lee 2020-03-30 21:56:34 -05:00
• e0951a851c Rune recipes to json Vincent Lee 2020-03-30 21:55:28 -05:00
• 748ef78b3a Petal recipes to json Vincent Lee 2020-03-30 21:24:07 -05:00
• f8c80d519e Organize datagenerators a bit Vincent Lee 2020-03-30 17:26:54 -05:00
• 604e0f5d99 Brew recipes to json Vincent Lee 2020-03-30 17:24:11 -05:00
• 12129ea470 Move brews to a forge registry (about time) Vincent Lee 2020-03-30 16:42:04 -05:00
• 9af5cdbd2d Cleanups, remove IBotaniaBoss (did anyone ever use this?) Vincent Lee 2020-03-30 15:50:27 -05:00
• 4616924dae Fix formatting Vincent Lee 2020-03-29 19:56:41 -05:00
• e61b4b2b9c Fix some rendertypes, preallocate the pool water buffer to fix #3210 Vincent Lee 2020-03-29 19:47:51 -05:00
• d4734e3fe6 Move inventory cases of itemfinder to last, fixes villager trades not being shown. Allow wandering trader to be scanned as well. Vincent Lee 2020-03-29 13:26:40 -05:00
• c7585c3c2c Fix a ton of accessory renders. Remaining: tiaras, cloaks, belts, cosmetics Vincent Lee 2020-03-29 13:10:15 -05:00
• d0f9f108c0 Fix cosmeticable items never rendering if no cosmetic Vincent Lee 2020-03-29 11:49:28 -05:00
• 52d47de619 Use our own render path for curios so the layer can be passed in Vincent Lee 2020-03-29 11:17:10 -05:00
• 7b979c430e Beta build Vincent Lee 2020-03-29 11:15:15 -05:00
• 90b5f32a60 Update contributors.properties Vasco Lavos 2020-03-29 06:59:33 +01:00
• 09b18e8ab9 Allow json states to be plain strings, fix up error handling and gog build Vincent Lee 2020-03-28 20:42:19 -05:00
• c412c671f9 Update contributors.properties Vasco Lavos 2020-03-28 18:56:57 +00:00
• e0f272a358 Fix mana tablet render, again hopefully for good Vincent Lee 2020-03-28 13:34:48 -05:00
• f675d2ff80 Fix contributor renders, hopefully for good Vincent Lee 2020-03-28 13:01:05 -05:00
• 02c3c82cf3 Update contributors.properties Vasco Lavos 2020-03-28 10:48:15 +00:00
• 5c22d60477 Update contributors.properties Vasco Lavos 2020-03-26 17:31:24 +00:00
• 15d0a8a219 Move pure daisy to json, clean up block input handling slightly Hubry 2020-03-26 12:56:51 +01:00
• e7d1bc2b4b Don't generate 'count' into json if it's 1 Vincent Lee 2020-03-25 15:57:53 -05:00
• f88b101b6b Move GoG mana infusion recipes to the gog datapack Vincent Lee 2020-03-25 15:52:23 -05:00
• 890034ec56 Increment r-version to match minecraft version, beta build Vincent Lee 2020-03-25 15:32:57 -05:00
• 53facd1f5f Fix formatting Vincent Lee 2020-03-25 15:31:44 -05:00
• 7ff539c5cd Move mana infusion to json Vincent Lee 2020-03-25 15:25:50 -05:00
• 64bd4cb390 Fix bergamute wrapped sounds being discarded as silent, closes #3218 Hubry 2020-03-25 20:23:35 +01:00
• 80dc95684e getInputs is redundant with getIngredients Vincent Lee 2020-03-25 13:53:43 -05:00
• ff1d8ca293 Move lexicon elven trade recipe as well Vincent Lee 2020-03-25 13:47:42 -05:00
• ccd2d01bb7 Bump patchouli Vincent Lee 2020-03-24 21:33:41 -05:00
• 188cf3f5a0 Experimental: Move elven trade recipes to vanilla json system Vincent Lee 2020-03-24 21:19:16 -05:00
• 1a0c730b4f Update contributors.properties Vasco Lavos 2020-03-23 01:20:21 +00:00
• df3f177180 Vanilla block/cross doesn't set correct parent, do so. Fixes #3214 Vincent Lee 2020-03-22 20:07:54 -05:00
• 68048891d7 Fix cocoon render being offset, change pixie spawn chance attribute registration location again. Vincent Lee 2020-03-22 19:59:06 -05:00
• 527e3b07fd Update contributors.properties Vasco Lavos 2020-03-21 20:24:33 +00:00
• e0cc95c521 Update contributors.properties Vasco Lavos 2020-03-21 17:31:35 +00:00
• d67e884b69 Update contributors.properties Vasco Lavos 2020-03-21 16:38:30 +00:00
• 24b6f06a80 Fix a bunch of waterlogging edge cases. Closes #3188 Vincent Lee 2020-03-19 21:25:17 -05:00
• 9d99c7184f Account for nullable placer in onBlockPlacedBy. Closes #3215 Vincent Lee 2020-03-19 21:04:36 -05:00
• 2399745ff1 Fix formatting Vincent Lee 2020-03-19 11:28:59 -05:00
• 123b750d24 Loonium no longer runs or consumes mana in peaceful mode Vincent Lee 2020-03-17 14:55:43 -05:00
• 9fa67371f0 Tall mystical flowers require vanilla shears again Vincent Lee 2020-03-17 14:54:48 -05:00
• 315a4c3a02 Fix loonium crash and also allow drowned to be spawned. Vincent Lee 2020-03-17 13:32:55 -05:00
• 160b0c9887 Bump forge, fix #3123 with global loot modifier Vincent Lee 2020-03-16 21:40:35 -05:00
• f1ce9a2e7b Fix blood pendant render crashing. Closes #3213 Vincent Lee 2020-03-16 20:30:56 -05:00
• ad7666e668 Update contributors.properties Vasco Lavos 2020-03-15 21:46:17 +00:00
• cacb5121b3 Cocoons can now be forced to spawn rare mobs with gaia spirits Hubry 2020-03-14 12:50:34 +01:00
• 9fb509eab9 Merge branch 'master' of github.com:Vazkii/Botania into 1.15 Vincent Lee 2020-03-13 17:10:47 -05:00
• d14fba628b This never got incremented last release :wacko: Vincent Lee 2020-03-13 17:09:23 -05:00
• 9e50843ee4 Fix #3208 Vincent Lee 2020-03-13 17:07:03 -05:00
• a2f8de9075 Merge 1.14 Vincent Lee 2020-03-13 17:03:33 -05:00
• ae6679d06f Right click to update mana is gone :crabrave: Vincent Lee 2020-03-13 16:32:48 -05:00
• 86bb0df996 Update contributors.properties Vasco Lavos 2020-03-13 15:40:53 +00:00
• 888b3235ea Only generate mana from items on server side. Might fix #3195 Vincent Lee 2020-03-12 20:11:38 -05:00
• ed1005b57b Fix ghost rail crashing when landing on a ghost rail then running onto a mundane rail Vincent Lee 2020-03-12 20:08:48 -05:00
• dca245bfac Fix flower map being thread unsafe Vincent Lee 2020-03-12 19:03:55 -05:00
• 54c147c982 Fix flower models being broken Vincent Lee 2020-03-12 11:33:31 -05:00
• d1f54d0964 Switch line endings to lf Hubry 2020-03-11 11:41:41 +01:00
• 2066bc61a9 Normalize java line endings on crlf Hubry 2020-03-11 02:13:03 +01:00
• 11ea832cbe Bump Curios, handle curio drop event for ivy, drop items that don't fit Hubry 2020-03-11 01:19:59 +01:00
• 058b03660f Update contributors.properties Vasco Lavos 2020-03-10 12:08:13 +00:00
• ef982f1e9e Fix mana clip attaching destroying lenses after recipe preview Hubry 2020-03-09 18:51:16 +01:00