Commit Graph
5336 Commits
Author SHA1 Message Date
Vincent Lee 69e48d116e Fix #2262 2017-05-13 22:53:27 -05:00
Vincent Lee cde78d9b5b Remove unused unstable block/mana beacon jsons 2017-05-13 22:53:27 -05:00
Vasco Lavos b362d417e7 Update contributors.properties 2017-05-09 18:56:10 +01:00
Vincent Lee 8cf49dc1c0 Reenable shifts on double plants as it works again for forge 2292+ 2017-05-03 14:29:10 -05:00
Vincent Lee 46bff28dfc Fix #2253 2017-05-03 14:19:45 -05:00
Vincent Lee e0f3ba881d Fix #2254, #2228 2017-05-02 11:03:18 -05:00
Vincent Lee 04fc77b25f Bump forge to fix PIE issues. Closes #2091, unofficial repo #472 2017-05-01 18:34:45 -05:00
Vincent Lee 6a184f085d Fix #2250 2017-04-29 15:41:11 -05:00
Vasco Lavos 0162178263 Update contributors.properties 2017-04-29 19:28:47 +01:00
Vasco Lavos 90e060de45 build 2017-04-27 16:56:43 +01:00
Vincent Lee 160a174677 Pass enchanter right clicks through to item when there's nothing to do. Closes #2244 2017-04-14 18:56:43 -05:00
Vincent Lee 982b31a764 A debug snuck in 2017-04-10 19:07:33 -05:00
Vincent Lee d98e775eb6 Make some rune recipes oredicted, closes #2235 2017-04-10 19:05:14 -05:00
Vincent Lee 187d74ac1e Fix #2243 2017-04-10 18:53:00 -05:00
Vincent Lee a0dfbe6524 Clean up wand code a bit. Closes #2239, closes #2215 2017-04-10 18:32:04 -05:00
Vincent Lee 8791db9b10 Merge pull request #2212 from codycoolwaffle/patch-1
Fixes #2207
2017-04-06 21:36:01 -05:00
Vasco Lavos cb3886659a Update contributors.properties 2017-04-01 20:04:31 +01:00
Vasco Lavos fd0b4323d9 Update contributors.properties 2017-03-27 21:24:15 +01:00
Vincent Lee ee2616579d Lexicon hud shows actual keybinding instead of shift, closes #2216 2017-03-24 11:39:45 -05:00
codycoolwaffle 3ea9ad8cb1 Fixes #2207
MC 1.9 changed the potion effect numbers, this is to accommodate with those changes.
2017-03-23 08:49:01 -07:00
Vincent Lee 25c24c0ab9 Fix #2208 mostly 2017-03-21 12:39:15 -05:00
Vincent Lee b444947c9a Fix #2209 mana burst visualization lag again 2017-03-20 22:57:06 -05:00
Vasco Lavos f9f56bd273 Update contributors.properties 2017-03-17 22:43:53 +00:00
Vincent Lee 78610b2d59 Fix animated torch not animating smoothly when toggled serverside (bursts and hourglass) 2017-03-17 11:18:32 -05:00
Vincent Lee 8529cd2ae9 Mod flowers bounding boxes now match their shift, like vanilla flowers 2017-03-16 19:57:34 -05:00
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