Commit Graph
2611 Commits
Author SHA1 Message Date
Vincent Lee 02fbb7f957 Merge branch 'master' into flattening_test 2017-12-16 12:45:00 -06:00
Vincent Lee 1b4b4cce7a Fix #2462 (and a compile error derp from before) 2017-12-16 12:32:55 -06:00
Vincent Lee a7f4b7ab7b Minor cleanup 2017-12-15 22:04:34 -06:00
Vincent Lee 52281e047b Flatten horns 2017-12-15 21:41:58 -06:00
Vincent Lee e5aa9339df Flatten chakrams 2017-12-15 21:16:48 -06:00
Vincent Lee 1d997c7f3b Flatten Quartz 2017-12-15 20:45:19 -06:00
Vincent Lee a96d2ce1ec Since we're renaming anyways, make the manaresource new names more canonical 2017-12-15 20:07:39 -06:00
Vincent Lee b124c60135 Remove dark quartz disable config 2017-12-15 19:11:30 -06:00
Vincent Lee 01611be2a9 Fix manaresource recipes in lexicon 2017-12-11 12:26:08 -06:00
Vincent Lee 68583d03d3 Flatten vial/flask 2017-12-11 12:20:15 -06:00
Vincent Lee cf3ab8d337 Fix manaresource unlocal names 2017-12-11 11:56:56 -06:00
Vincent Lee d7ecb447c2 Cleanup in crafting recipes 2017-12-10 20:17:18 -06:00
Vincent Lee d5732131d1 Pass mod id to EventBusSubscriber. Apparently you're supposed to do this. 2017-12-10 20:11:28 -06:00
Vincent Lee 709997e72d Add a fixer to flatten 2017-12-10 19:44:32 -06:00
Vincent Lee 479c659d50 Fix startup crash 2017-12-10 19:30:22 -06:00
Vincent Lee 4c5a058173 Flatten manaresource 2017-12-10 19:15:47 -06:00
Vincent Lee 15ab7d67d1 API doc tweak for stack nulls 2017-12-07 13:03:22 -06:00
Vincent Lee eb86921f1d Fix #2429 2017-12-07 12:55:55 -06:00
Vincent Lee 0634799e80 9cedab8 but for spreaders too 2017-12-07 08:49:48 -06:00
Kitten eb84402b13 Fix incorrect step assist height (#2446)
* Fix incorrect step assist height

* Boi, I messed up, oh no, now it's correct
2017-12-07 08:47:45 -06:00
Vincent Lee 56cf0aa73b Fix loonium loot distribution being skewed, closes #2293 2017-12-03 21:52:01 -06:00
Vincent Lee ceb1af2a38 Fix manastorm charge/corporea index star animations being choppy 2017-12-03 18:46:38 -06:00
Vincent Lee 25ad5cc06f Move a bunch of advancements to use_item_success trigger 2017-11-26 11:30:22 -06:00
Vincent Lee e068b4675b Fix CME in CorporeaRequestTrigger 2017-11-26 11:30:22 -06:00
Vincent Lee 794d0284d1 Move GG no armor to advancement 2017-11-26 11:30:22 -06:00
Vincent Lee 7b8ce2e901 Move corporea index advancement to trigger 2017-11-24 14:56:04 -06:00
Vincent Lee ba8c4f8af4 Fix another potential race in GG boss bar collection 2017-11-24 14:56:04 -06:00
Vincent Lee e9bd8e51cc Remove corporea DSU integration because MFR isn't here 2017-11-24 14:56:04 -06:00
Vincent Lee 3d01311604 Fix incorrect corporea result message. Closes #2424 2017-11-24 14:56:04 -06:00
Vincent Lee 21a5f20018 Move alfportal advancement to general trigger 2017-11-24 14:56:04 -06:00
Vincent Lee 1d754b010a Fix lurking race condition in TileCorporeaIndex 2017-11-24 14:56:04 -06:00
Vincent Lee a299257431 Fix division by zero when Ingredient has no stacks. Closes #2444 2017-11-19 09:31:55 -06:00
Vincent Lee 9cedab815f Fix #2263 2017-11-14 23:01:07 -06:00
Vincent Lee 68f09b02a1 Fix #2437 Manastorm charges don't give mana 2017-11-14 22:50:38 -06:00
Vasco Lavos 45bec074fd Merge pull request #2402 from quat1024/gourmachew
Gourmarillys produce chewing sounds and particles
2017-11-11 14:26:02 +00:00
Vincent Lee 5b9a19231e Extra imports 2017-11-05 14:28:47 -06:00
Vincent Lee 2ff4db9650 Modernize flaky TE reading in BlockPool, closes #2436 2017-11-05 14:25:57 -06:00
Vincent Lee 6fcd8e1f94 Fix #2433 2017-11-04 22:24:18 -05:00
Vincent Lee a0813e5f22 Fix shaders loading twice on startup 2017-10-19 08:49:18 -05:00
Vincent Lee 0ad1a96468 Fix #2009. stopgap for when Forge PR 4331 lands 2017-10-19 08:45:12 -05:00
Vincent Lee 7b3e9a3118 Fix rannuncarpus destroying shulker box and other itemized TE data. closes #2419 2017-10-19 08:32:02 -05:00
Vincent Lee f55fa57d14 Fix #2299 2017-10-15 18:28:51 -05:00
quat 6ec0807a4c Cleanup a bit, pitch down burps as mana returns dimish 😋 2017-10-04 17:45:14 -04:00
Vasco Lavos d81543fe47 Actually fix #2379 2017-10-01 19:19:31 +01:00
Vasco Lavos 42fccc9781 Make botania shaders work with albedo 2017-10-01 19:18:00 +01:00
quat a51867d966 Gourmaryllis produce particles and sound effects while eating.
(The effects slow down, too, as you feed the flower more of the same food. Hopefully this makes the gourma's "dimishing returns" mechanic more clear.)
2017-09-30 17:19:12 -04:00
Vasco Lavos e22003a4b2 Fixed mushrooms not fitting in the petal apothecary 2017-09-30 20:50:44 +01:00
Vasco Lavos 6b764eef26 Make the rune crafter challenge be categorized as Lunatic+ instead of Lunatic. 2017-09-30 19:20:32 +01:00
Vasco Lavos 1fe3a69101 Add Shulk Me Not to the challenges 2017-09-30 19:20:01 +01:00
Vasco Lavos 2dcb88b727 . 2017-09-30 19:02:47 +01:00