Vincent Lee
a6cf5653dc
Merge 1.14
2020-02-20 21:00:55 -06:00
Vincent Lee
1e280976c4
Some color fixes
2020-02-20 21:00:12 -06:00
Vincent Lee
c0eed8a8e9
Remove unneeded override as it's covered by the one above it now
2020-02-20 14:10:50 -06:00
Vincent Lee
6346da980e
Advancement: That's Why I Baked Bread
...
Context: Issue 2403, and https://www.nicovideo.jp/watch/sm33746095
2020-02-20 00:13:12 -06:00
Vincent Lee
b3ac525569
Loki ring advancement, no title yet
2020-02-19 23:39:31 -06:00
Vincent Lee
42193cc127
Azulejo creation now takes any blue dye
2020-02-18 19:40:07 -06:00
Hubry
337f9fe322
Add workaround crafting recipe for Botania banner patterns, rerun data
...
Closes #3114
I was planning to do this for a while, and accidentally added the empty
class for the recipe with the recipe generator...
2020-02-18 17:57:33 +01:00
Hubry
99df65bb45
Change the seed source for plentiful mantle rod, fixes #3178
2020-02-17 19:10:31 +01:00
Hubry
9cc6eb9870
Create recipe generator for existing json recipes
2020-02-17 18:34:20 +01:00
Vincent Lee
c19c4ecbb3
Generate floating flower item models and fix their in-hand transforms
2020-02-17 11:05:34 -06:00
Vincent Lee
df11e72db3
Fix compile error, make ColorHelper less awful
2020-02-16 21:45:18 -06:00
Vincent Lee
e5c5a37f27
Merge 1.14
2020-02-16 21:26:51 -06:00
Vincent Lee
59e0c6c987
Narrator: it wasn't released
2020-02-16 21:21:36 -06:00
Vincent Lee
9253a541c4
Replace bauble box slots with a player render because what else would i put there
2020-02-16 21:20:23 -06:00
Vincent Lee
3ccbef5c16
Loki ring now highlights center pos in bold even when not building a new list of cursors
2020-02-15 19:58:32 -06:00
Vincent Lee
162519dba3
Fix loki ring being bork, should now match 1.7 behavior exactly. Closes #3179
2020-02-15 19:58:32 -06:00
Vincent Lee
13668c5448
Modernize ToolCommon.raytraceFromEntity
2020-02-15 19:58:31 -06:00
Vincent Lee
dde52533fd
Corporea feedback for stack requests now uses the fancy component with hoverevent
2020-02-15 01:15:46 -06:00
Vincent Lee
f4886b8627
new Style.setColor -> applyTextStyle
2020-02-15 01:15:06 -06:00
Vincent Lee
d434a1c915
Eliminate awful logic duplication in ManaItemHandler
2020-02-15 01:12:11 -06:00
Vincent Lee
918372c404
Convert Pixie Spawn Chance into an attribute
2020-02-15 00:39:25 -06:00
Vincent Lee
622fd8a3f6
Remove old lexicon method
2020-02-14 23:59:33 -06:00
Vincent Lee
477e350757
Remove legacy meta method
2020-02-14 23:54:25 -06:00
Vincent Lee
669568f426
Move inner helper method of manaprof armor to the interface itself
2020-02-14 23:53:38 -06:00
Vincent Lee
92c6708a68
Replace sortable tool tooltypes with the ones that have been in forge for... a while
2020-02-14 23:50:45 -06:00
Vincent Lee
0a558f72bd
Some cleanups
2020-02-14 22:52:38 -06:00
Vincent Lee
85a7c986cf
Restore lexicon first person render, mostly
2020-02-14 22:48:53 -06:00
Vincent Lee
05fe2c195c
Bump patchouli and forge, fix floating flower in world render
2020-02-14 20:56:28 -06:00
Vincent Lee
9c23ff9257
Use forge's getHighlightTip for wand instead of rendering mode line ourselves
2020-02-14 20:24:02 -06:00
Vincent Lee
065d189c5e
Mark cocoon-spawned entities as un-despawnable
2020-02-10 13:17:05 -06:00
Vincent Lee
bb68017141
Fix missing nullcheck in platform. Closes #3168
2020-02-07 21:10:43 -06:00
Vincent Lee
647e122418
Fix unnecessary cast in CompositeLensRecipe
2020-02-07 13:55:04 -06:00
Vincent Lee
d46c35df14
Clean up agricarnation code a bit, fix it not speeding up berries and bamboo
2020-02-07 10:56:26 -06:00
Hubry
7a05395ba3
Add a decay indicator on stacks of hydroangeas
2020-02-06 19:00:53 +01:00
Hubry
bbb472c3a8
Fix exoflames trying to smelt unsmeltables after a smeltable was put in
2020-02-06 18:51:32 +01:00
Hubry
e96550208b
Fix spawner spawned slimes working for narslimmus
2020-02-06 01:25:47 +01:00
Hubry
d49fba9abc
Fix redirect lens pointing at 0,0,0, closes #3167
2020-02-05 00:38:24 +01:00
Vincent Lee
9006e7c795
Fix #3161 flight bar drained by creative/spectator
2020-02-04 16:59:04 -06:00
Hubry
10ac3c3067
Fix empty prisms allowing warped bursts to transfer mana
2020-02-02 22:51:29 +01:00
Vincent Lee
31de0d6dd1
Merge branch 'master' of github.com:Vazkii/Botania into 1.15
2020-01-31 13:14:42 -06:00
Vincent Lee
ca8f61b8b1
Get rid of all 1.7-era 'parN' style parameter names
2020-01-31 13:08:16 -06:00
Vincent Lee
ef79dc7507
Remove useless passing of 1|2 to setblockstate
2020-01-31 12:59:33 -06:00
Vincent Lee
d68f34fcfe
Fix red string blocks being placed backwards
2020-01-31 12:49:55 -06:00
Vincent Lee
4ea449d723
Revert vinculotus map back into a set, hack no longer needed thanks to getEffectivePos
2020-01-31 12:48:27 -06:00
Vincent Lee
144f023041
Clean up some reflection
2020-01-31 12:30:26 -06:00
Vincent Lee
ea4ecf92af
Remove blurmipmap hack
2020-01-31 12:08:04 -06:00
Vincent Lee
9d7e8b5c2f
Update to 1.15.2
2020-01-31 12:06:11 -06:00
Hubry
4f5adbe992
Fix dispensers checking valid cocoa directions on own pos, closes #3159
2020-01-30 19:50:05 +01:00
Hubry
12e67ab394
Replace 256 wand of the forest recipe jsons with one custom recipe type
...
Prevents flooding JEI with tons of irrelevant recipes, and recipe book
buttons going offscreen if you look at all the variants of the wand.
Side effect is not showing the colored wands in JEI/Patchouli, but
that's fine.
2020-01-30 19:02:41 +01:00
Hubry
7cbe19271c
Fix terra blade bursts ignoring players you can damage
...
I had this one check wrong
2020-01-30 19:02:40 +01:00