Commit Graph
5311 Commits
Author SHA1 Message Date
Vincent Lee 65cd429cb5 Clean out some unnecessary lines in blockstate jsons. smaller jsons are always a good thing 2017-03-14 19:13:02 -05:00
Vincent Lee 003bfa5c16 Make a blockstate json for animated torch to silence log errors, move item json to right place 2017-03-14 19:03:57 -05:00
Vincent Lee 886ed03510 Fix shimmering mushrooms popping off at strange times 2017-03-14 18:45:00 -05:00
Vincent Lee ea24ca751c Fix armor 'breathing' on armor stands. Closes #2191 2017-03-13 12:57:37 -05:00
Vincent Lee 751fe02072 Fix #2197 >_> 2017-03-12 14:05:10 -05:00
Vasco Lavos d760340da7 Merge branch 'master' of https://github.com/Vazkii/Botania 2017-03-12 10:35:10 +00:00
Vasco Lavos d5bd97b700 Fix the lexicon webpage looking for an en_US file that doesn't exist anymore. Closes #2196 2017-03-12 10:34:50 +00:00
Vasco Lavos 020f0a197f Update contributors.properties 2017-03-11 21:30:09 +00:00
Vasco Lavos 5320433dee build 342 2017-03-10 18:45:53 +00:00
Vasco Lavos 1a1620af41 AAAAAAAAAAAAAA 2017-03-10 18:39:05 +00:00
Vasco Lavos 86590d99ef Revert "Remove needless json files because predicates are cool"
This reverts commit 277fc1bca8.
2017-03-10 18:21:47 +00:00
Vasco Lavos 058e9dd6a4 These deps aren't required 2017-03-10 18:16:49 +00:00
Vasco Lavos 8ddce9b20c Update JEI 2017-03-10 18:11:15 +00:00
Vasco Lavos 277fc1bca8 Remove needless json files because predicates are cool 2017-03-10 18:03:47 +00:00
Vasco Lavos c2c09b30e8 Before I forget and ruin everything 2017-03-10 18:02:53 +00:00
Vasco Lavos 1a5262a659 Merge branch '1.11' 2017-03-10 18:01:37 +00:00
Vasco Lavos fa8d48b77b Build 341 2017-03-10 17:55:12 +00:00
Vasco Lavos 87283b7b9d Merge pull request #2186 from MCUpdater/master
Restrict ores from the ore dictionary to only those that are blocks.
2017-03-10 17:08:26 +00:00
Vincent Lee e2404988d4 Merge pull request #2189 from codewarrior0/patch-2
Fix Mana Enchanter only applying one enchanted book
2017-03-08 12:02:17 -06:00
David Vierra b0f0f85563 Fix Mana Enchanter only applying one enchanted book
`ench.func_191560_c` returns `true` if the two enchantments are mutually compatible.
2017-03-07 22:34:55 -10:00
Scott M. Barbour cd5f70c566 Restrict ores from the ore dictionary to only those that are blocks. 2017-03-05 23:18:32 -06:00
Vincent Lee 20c6388ed3 Remove unnecessary item drop fiddling. closes #2175, #2126 2017-03-04 14:51:02 -06:00
Vincent Lee b044c98051 Fix marimorphosis running clientside 2017-03-04 14:40:58 -06:00
Vincent Lee 63c93ebab4 Fix crystal bow not using mana, closes #2183 2017-03-01 13:40:03 -06:00
Vincent Lee f369c9ee55 Cleanup (corporea) spark interactions and invis flags. Closes #2179 2017-02-28 23:47:11 -06:00
Vincent Lee 4814fc6bde Fix rannuncarpus crash placing pistons, closes #2182 2017-02-28 19:50:22 -06:00
Vincent Lee 7a58166275 Fix weight lens spawning falling blocks too high, and spawn some fancy particles 2017-02-28 16:22:06 -06:00
Vasco Lavos 63e5c81a28 Update contributors.properties 2017-02-22 18:41:15 +00:00
Vincent Lee ba69be2f31 Make sparkle particles match 1.7 more closely (it's still a bit off >_>) 2017-02-20 23:43:42 -06:00
Vincent Lee 6e5f757518 Fix nullable annotation stuff + some stack nulls. Closes #2162 2017-02-20 23:04:37 -06:00
Vincent Lee 0d1324c45d Minor clean up ItemNBTHelper 2017-02-19 21:37:05 -06:00
Vincent Lee bf1b3a3aa9 Fix huge performance drop when simulating fake bursts. Closes #2174 2017-02-19 21:23:49 -06:00
Vincent Lee 14fea3891f Fix manual dropping of items, closes #2173 2017-02-19 18:31:47 -06:00
Vincent Lee 3cf1a606e9 Merge master 2017-02-19 00:18:43 -06:00
Vincent Lee 59a5921713 AoE mining now properly fires break events and drops xp. Closes #2171 2017-02-19 00:09:21 -06:00
Vincent Lee c722443dc2 More tool cleaning 2017-02-18 23:34:37 -06:00
Vincent Lee 3c80b25277 Minor cleanups in tools 2017-02-18 23:00:50 -06:00
Vincent Lee 87484f0db3 Fix bad armor values, closes #2166 2017-02-18 20:45:02 -06:00
Vincent Lee 7cd3fc826f Fluxfield uses FE instead of RF, delete RF api files. Closes #2117 2017-02-18 20:31:33 -06:00
Vasco Lavos 4abb66a9d9 Update contributors.properties 2017-02-13 20:08:30 +00:00
Vincent Lee 6627ca091d Fix marimorphosis running clientside 2017-02-13 13:10:15 -06:00
Vincent Lee de99548229 Merge master 2017-02-13 12:37:37 -06:00
Vincent Lee f9974d77a0 Remove lexicon references to thatch and reed blocks, closes #2157 2017-02-07 19:50:50 -06:00
Vasco Lavos 687772bb9a Update contributors.properties 2017-02-06 16:44:06 +00:00
Vincent Lee 13bbb7779b Fix some things not being rendered fullbright 2017-02-04 19:50:59 -06:00
Vincent Lee 02e2c2500a Fix more stack nulls in enchanter 2017-02-04 19:39:07 -06:00
Vincent Lee ee0740b2bb Fix missing particles/last recipe messages for runic altar 2017-02-04 14:02:39 -06:00
Vincent Lee 6d97e48de5 Fix soulscribe not dealing extra damage due to a 1.9 porting error. Closes #2148 2017-01-30 21:58:35 -06:00
Vincent Lee 02b4a25e70 Dear past self: don't try clever tricks that don't actually work and probably run slower. Closes #2111 2017-01-30 21:32:25 -06:00
Vincent Lee a7d92d5451 Fix durability bars for 1.11 2017-01-29 22:29:37 -06:00