Commit Graph
6431 Commits
Author SHA1 Message Date
Hubry d4cab320a8 Fix spellbinding cloth doing literally nothing (#3064) 2019-12-24 15:47:37 -06:00
Hubry 7875372bb4 Fix gaia guardian hardmode advancement and cacophonium recipe (#3063) 2019-12-24 15:30:50 -06:00
Vincent Lee 8c47ce48ce update credits and faq 2019-12-24 15:11:30 -06:00
Hubry 554a34e8be Un-specialcase elven lexicon recipe, improve elven trade api (#3062) 2019-12-24 15:11:00 -06:00
Vincent Lee 566c29a809 Update gog page, partially fix lexicon page 2019-12-24 14:59:54 -06:00
Vincent Lee 4aeb955de9 Clarify spellcloth can remove curses 2019-12-24 13:29:16 -06:00
Vincent Lee ed1c600d45 Brew and incense tooltips now render consistently with vanilla potions 2019-12-24 13:10:14 -06:00
Vincent Lee cbe78aa15b Fix santaweave armor names, other incorrectly-colored tooltips 2019-12-24 12:58:18 -06:00
Vincent Lee 3a3bfcd0b3 Restore water bowl model 2019-12-24 12:30:11 -06:00
Vincent Lee e0762529e2 Why not? 2019-12-24 12:13:33 -06:00
Vincent Lee 001a4e1813 Delete old lexicon category icons 2019-12-24 12:02:36 -06:00
Vincent Lee 0283d5d8f3 Clean up lang files of old lexicon stuff, also fix entity names in non-en_us files 2019-12-24 12:02:18 -06:00
Vincent Lee d8bf82700c Move contributing/issue template to .github 2019-12-24 11:26:04 -06:00
Vincent Lee 4cd0532336 Wacko 2019-12-24 11:18:02 -06:00
Vincent Lee b3770a069a Fix #2877, replacement of #2962 2019-12-24 11:16:59 -06:00
Hubry ddbeafa582 Move exoflame heatable to a cap, convert furnace part to use it (#3061)
* Replace curio cap provider with a more generic one

* Move exoflame heating to a cap, move the last part to bellows
2019-12-24 10:56:46 -06:00
Vincent Lee b80c3ca505 Patchouli tweaks 2019-12-23 16:19:54 -06:00
Vincent Lee c0e9e8f105 Cleanup 2019-12-23 15:52:19 -06:00
Vincent Lee 144cd96add Refine corporea PR, fix interceptors being broken 2019-12-23 15:49:36 -06:00
Vincent Lee 5a7f3a8a11 Corporea funnels now detect vertical item frames 2019-12-23 15:25:13 -06:00
Vincent Lee 6a19638e89 Merge pull request #3060 from Alwinfy/corporea
Overhaul Corporea to pass around CorporeaRequestMatchers instead of Objects
2019-12-23 15:24:41 -06:00
Alwinfy 0b25326383 And one more formatting thing 2019-12-23 13:26:10 -06:00
Alwinfy fe9341791d Make CorporeaRequestMatcher an interface 2019-12-23 12:58:52 -06:00
Alwinfy c613b82e45 Fix some minor formatting (thanks Hubry) 2019-12-23 12:58:04 -06:00
Alwinfy a0908c9319 Overhaul Corporea to pass around CorporeaRequestMatchers instead of Objects 2019-12-23 10:11:28 -06:00
Vincent Lee 468d2ec253 Merge master 2019-12-22 18:56:24 -06:00
Vincent Lee 7243d31567 Create stale.yml 2019-12-22 18:38:30 -06:00
Vincent Lee b234d2e199 beta build 2019-12-22 17:03:05 -06:00
Vincent Lee c7431c7bc7 Fix #3055 2019-12-22 16:55:24 -06:00
Vincent Lee 517e5139f5 Fix changelog 2019-12-22 12:40:07 -06:00
Vincent Lee 4a327fe3ea final 1.12 build 2019-12-22 12:38:15 -06:00
Vincent Lee da5918e46c First pass: Restore GoG, clean up some lexicon stuff 2019-12-21 23:37:36 -06:00
Vincent Lee a641aed1b2 Fix Gaia Guardian crashes in certain cases, also fix them being leashable, and disable music repetition due to vanilla/lwjgl bug 2019-12-21 16:09:08 -06:00
Vasco Lavos b0f31ec5dd Update contributors.properties 2019-12-21 18:15:27 +00:00
Vincent Lee 4278380a43 Merge pull request #3059 from Hubry/redstringcontainer
Fix red string container destroying caps and popping off sparks sometimes
2019-12-21 00:06:02 -06:00
Hubry f3b36299e8 Fix redstring container destroying caps and popping off sparks sometimes 2019-12-21 00:40:12 +01:00
Vasco Lavos 4baccf84a3 Update contributors.properties 2019-12-18 20:06:46 +00:00
Vincent Lee 55a0f3e04e Fix #3054 2019-12-17 22:15:53 -06:00
Vasco Lavos 5cd7b835bb Update contributors.properties 2019-12-17 18:11:32 +00:00
Vincent Lee 07c0414f62 Delete unused modcraftingrecipes 2019-12-16 11:45:08 -06:00
Vincent Lee 31e0e57b81 cleanup 2019-12-16 11:41:27 -06:00
Vincent Lee 6bf3869361 same for enchanter 2019-12-16 11:37:59 -06:00
Vincent Lee 733666b440 same for alf portal 2019-12-16 11:19:26 -06:00
Vincent Lee eee165556a terraplate now checks using patchouli multiblock 2019-12-16 10:53:13 -06:00
Vincent Lee a683d2442a Fix spreaders and force relay being spawnable 2019-12-16 10:32:02 -06:00
Vincent Lee 7acdb06518 Swap ring now recognizes shulker boxes 2019-12-16 09:47:48 -06:00
Vincent Lee 59636634df Hopperhocks now detect vertically-facing item frames. Also fix probably bugs with double chests. 2019-12-14 15:04:48 -06:00
Vincent Lee bb8563cd7a Spark mana particles no longer collide, closes #3033 2019-12-14 13:58:57 -06:00
Vincent Lee cf14df38ec Merge pull request #3047 from nekosune/master
Added Quartz blocks to OreDict
2019-12-14 13:48:10 -06:00
Vincent Lee 1eb2885d6e Merge pull request #3049 from Hubry/headflower
Fix head flower render
2019-12-14 13:33:43 -06:00