Commit Graph
6784 Commits
Author SHA1 Message Date
Vincent Lee 4616924dae Fix formatting 2020-03-29 19:56:41 -05:00
Vincent Lee e61b4b2b9c Fix some rendertypes, preallocate the pool water buffer to fix #3210 2020-03-29 19:47:51 -05:00
Vincent Lee d4734e3fe6 Move inventory cases of itemfinder to last, fixes villager trades not being shown. Allow wandering trader to be scanned as well. 2020-03-29 13:26:40 -05:00
Vincent Lee c7585c3c2c Fix a ton of accessory renders. Remaining: tiaras, cloaks, belts, cosmetics 2020-03-29 13:10:15 -05:00
Vincent Lee d0f9f108c0 Fix cosmeticable items never rendering if no cosmetic 2020-03-29 11:49:28 -05:00
Vincent Lee 52d47de619 Use our own render path for curios so the layer can be passed in 2020-03-29 11:17:10 -05:00
Vincent Lee 7b979c430e Beta build 2020-03-29 11:15:15 -05:00
Vincent Lee 09b18e8ab9 Allow json states to be plain strings, fix up error handling and gog build 2020-03-28 20:42:19 -05:00
Vincent Lee e0f272a358 Fix mana tablet render, again hopefully for good 2020-03-28 13:35:00 -05:00
Vincent Lee f675d2ff80 Fix contributor renders, hopefully for good 2020-03-28 13:35:00 -05:00
Hubry 15d0a8a219 Move pure daisy to json, clean up block input handling slightly
Change input format for mana infusion catalysts
Shorten JEI pure daisy windows a bit to fit more at once
2020-03-26 12:56:51 +01:00
Vincent Lee e7d1bc2b4b Don't generate 'count' into json if it's 1 2020-03-25 15:57:53 -05:00
Vincent Lee f88b101b6b Move GoG mana infusion recipes to the gog datapack 2020-03-25 15:52:23 -05:00
Vincent Lee 890034ec56 Increment r-version to match minecraft version, beta build 2020-03-25 15:32:57 -05:00
Vincent Lee 53facd1f5f Fix formatting 2020-03-25 15:31:44 -05:00
Vincent Lee 7ff539c5cd Move mana infusion to json 2020-03-25 15:25:50 -05:00
Vincent Lee 80dc95684e getInputs is redundant with getIngredients 2020-03-25 13:53:43 -05:00
Vincent Lee ff1d8ca293 Move lexicon elven trade recipe as well 2020-03-25 13:47:42 -05:00
Vincent Lee ccd2d01bb7 Bump patchouli 2020-03-24 21:33:41 -05:00
Vincent Lee 188cf3f5a0 Experimental: Move elven trade recipes to vanilla json system 2020-03-24 21:19:16 -05:00
Vincent Lee df3f177180 Vanilla block/cross doesn't set correct parent, do so. Fixes #3214 2020-03-22 20:07:54 -05:00
Vincent Lee 68048891d7 Fix cocoon render being offset, change pixie spawn chance attribute registration location again. 2020-03-22 19:59:06 -05:00
Vincent Lee 2399745ff1 Fix formatting 2020-03-19 11:28:59 -05:00
Vincent Lee 123b750d24 Loonium no longer runs or consumes mana in peaceful mode 2020-03-17 14:55:43 -05:00
Vincent Lee 9fa67371f0 Tall mystical flowers require vanilla shears again 2020-03-17 14:54:48 -05:00
Vincent Lee 315a4c3a02 Fix loonium crash and also allow drowned to be spawned. 2020-03-17 13:32:55 -05:00
Vincent Lee 160b0c9887 Bump forge, fix #3123 with global loot modifier 2020-03-16 21:40:35 -05:00
Vincent Lee f1ce9a2e7b Fix blood pendant render crashing. Closes #3213 2020-03-16 20:30:56 -05:00
Vincent Lee 9fb509eab9 Merge branch 'master' of github.com:Vazkii/Botania into 1.15 2020-03-13 17:10:47 -05:00
Vincent Lee d14fba628b This never got incremented last release :wacko: 2020-03-13 17:09:23 -05:00
Vincent Lee 9e50843ee4 Fix #3208 2020-03-13 17:07:03 -05:00
Vincent Lee a2f8de9075 Merge 1.14 2020-03-13 17:03:33 -05:00
Vincent Lee ae6679d06f Right click to update mana is gone :crabrave: 2020-03-13 16:33:02 -05:00
Vasco Lavos 86bb0df996 Update contributors.properties 2020-03-13 15:40:53 +00:00
Vincent Lee 888b3235ea Only generate mana from items on server side. Might fix #3195 2020-03-12 20:11:38 -05:00
Vincent Lee ed1005b57b Fix ghost rail crashing when landing on a ghost rail then running onto a mundane rail 2020-03-12 20:08:48 -05:00
Vincent Lee dca245bfac Fix flower map being thread unsafe 2020-03-12 19:04:08 -05:00
Vincent Lee 54c147c982 Fix flower models being broken 2020-03-12 11:33:31 -05:00
Hubry d1f54d0964 Switch line endings to lf
I am not smart. And I was a bit in a rush last time.
2020-03-11 11:41:41 +01:00
Hubry 2066bc61a9 Normalize java line endings on crlf
This should fix the build?
2020-03-11 02:13:03 +01:00
Hubry 11ea832cbe Bump Curios, handle curio drop event for ivy, drop items that don't fit 2020-03-11 01:19:59 +01:00
Vasco Lavos 058b03660f Update contributors.properties 2020-03-10 12:08:13 +00:00
Hubry ef982f1e9e Fix mana clip attaching destroying lenses after recipe preview 2020-03-09 18:51:16 +01:00
Vasco Lavos f49e3bdb37 Update contributors.properties 2020-03-09 10:30:09 +00:00
Hubry 6d7e5037d9 Update contributing info, add PMD/Spotless to github actions builds 2020-03-07 23:07:41 +01:00
Hubry 2152473edb Run Spotless, cleanup unused imports, add braces to one line for/if/etc. 2020-03-07 22:39:15 +01:00
Hubry 21d9d95611 Set up Spotless and PMD for some basic formatting 2020-03-07 22:38:28 +01:00
Al Winfy a534f041f5 Move spreader magic-numbers into the enum (#3200) 2020-03-07 12:38:36 -06:00
Vasco Lavos 5a6fc49079 Update contributors.properties 2020-03-06 18:17:18 +00:00
Vasco Lavos 807c7174ed Update contributors.properties 2020-03-05 17:43:43 +00:00