Commit Graph
4820 Commits
Author SHA1 Message Date
Vincent Lee ad5b7fd73b Merge upstream 2016-02-18 10:04:02 -06:00
Vincent Lee 4f8376a148 Fix dark quartz disabled crashing client (Renari), other cleanups in modelhandler. Closes #119. v0.6.1-beta 2016-02-18 09:26:16 -06:00
Vincent Lee 9e0c7ba0c7 Cleanup in modelhandler, tweak to caching in corporea cube renderer 2016-02-17 17:49:54 -06:00
Vincent Lee 769ed577c4 Fix a rare crash rendering the debug screen 2016-02-17 16:52:07 -06:00
Vincent Lee 78c65fb065 All apothecaries done finally v0.6-beta 2016-02-16 13:34:26 -06:00
Vincent Lee a647f4c784 Mountain apothecary 2016-02-15 16:21:54 -06:00
Vincent Lee 37d63bc672 Remove some top level sideonlys where they werent meant to be used, fix wireframes rendering too opaquely 2016-02-14 22:31:00 -06:00
Vincent Lee 333102a08f Lambdaify shadercallback 2016-02-14 19:13:25 -06:00
Vincent Lee d1ff5e89ca Merge upstream pull request #1693 from Katrix-/relicsUUID 2016-02-14 10:54:35 -06:00
Vincent Lee 9fe4e0f8cc Kinda migrated crystal cuvbe to json 2016-02-13 12:28:52 -06:00
Vincent Lee b6204f9a41 Merge branch 'MC18' of github.com:williewillus/Botania into MC18 2016-02-12 23:07:36 -06:00
Vincent Lee 988e80a3f2 Initial attempt at animated corporea crystal cube 2016-02-12 23:07:21 -06:00
Vincent Lee d1d8eb801c Actually commit the texture 2016-02-12 22:05:22 -06:00
Vincent Lee f7902ae574 Merge pull request #115 from KaseiFR/MC18
Fix RF interaction with the Mana Fluxfield
2016-02-12 20:54:54 -06:00
KaseiFR d7bb959a87 Fix RF integration
Buildcraft pipes are particularly sentitive to directions.
2016-02-13 03:29:14 +01:00
TheWhiteWolves b0fe511fc8 Add the Clayconia Petite (X & Z range 2, Y range 1), Closes #1805 2016-02-13 01:09:21 +00:00
Jonathan Smith fc9470777b Merge pull request #1802 from yrsegal/master
Multiparts now work on both the client and the server.
2016-02-11 12:10:36 +00:00
Vincent Lee bef96830bb Pump head texture 2016-02-11 00:29:46 -06:00
Vincent Lee a20e510318 Merge pull request #114 from GirafiStudios/MC18
Updated to official RF API.
2016-02-10 21:26:08 -06:00
yrsegal a0d0f2ba65 Multiparts now work on both the client and the server. 2016-02-10 16:57:20 -05:00
Vasco Lavos 044e61f73f Merge pull request #1801 from Vazkii/revert-1800-master
Revert "Multiparts now work on both the client and the server."
2016-02-10 21:49:31 +00:00
Vasco Lavos abc7756a9b Revert "Multiparts now work on both the client and the server." 2016-02-10 21:49:26 +00:00
Jonathan Smith c8a01f7da0 Merge pull request #1800 from yrsegal/master
Multiparts now work on both the client and the server.
2016-02-10 21:48:58 +00:00
GirafiStudios ba944db343 Updated to official RF API. 2016-02-10 20:33:21 +01:00
yrsegal 59b177e231 Multiparts now work on both the client and the server. 2016-02-10 13:51:31 -05:00
Jonathan Smith 27a5991350 Merge pull request #1798 from isochronous/lex-botania-lang_en-corrections
Lexica Botania lang_en corrections
2016-02-10 08:03:22 +00:00
Jeremy McLeod e0023c0566 Corrected spelling & grammar in Lexica Botania for:
- Manastorm Charge
- Teru Teru Bozu
- Mana Blaster
- Rod of the Lands
- Manasteel Equipment
- Terrasteel Armor
- Terra Shatterer
2016-02-09 19:42:56 -05:00
Vincent Lee d3e1bf80b4 Fix star particle - corporea index and manastorm charge 2016-02-08 22:39:32 -06:00
Vincent Lee 006519bcf5 Slightly nerfed path speed boost 2016-02-08 22:23:23 -06:00
Vincent Lee e522d8e24c comment out debug output 2016-02-08 21:44:04 -06:00
Vincent Lee c7d28c57de Partial fix for platform + smartmodels 2016-02-08 13:03:38 -06:00
Vincent Lee 972d0e5bf6 Safety check in platform model, update JEI 2016-02-08 10:18:12 -06:00
Vincent Lee 2b57a2232d Update lexicon to reflect new corporea funnel item frame values 2016-02-07 22:07:42 -06:00
Vincent Lee b9b066617a Fix floating flower lightlevel crash v0.5.4.1-beta 2016-02-07 21:55:44 -06:00
Vincent Lee 512884729e Tweak mossy apothecary break texture, fix lexicon crash again 2016-02-07 21:54:11 -06:00
Vincent Lee 2ab491867e Revert "Fix lexicon npe, closes #94"
This reverts commit 6f6f330a5a.
2016-02-07 21:50:53 -06:00
Vincent Lee 3f5159fe75 Mossy apothecary 2016-02-07 19:09:46 -06:00
Vincent Lee 0f41f1fcc0 Add zipped form of alt textures v0.5.4-beta 2016-02-07 12:06:04 -06:00
Vincent Lee f41e393322 Mesa apothecary split 2016-02-07 11:51:07 -06:00
Vincent Lee 1de5048653 More lexicon model work 2016-02-07 11:47:25 -06:00
Vincent Lee 7e1ef7aa7f Tweak gravityrod, terrapick, and tornadorod animation. Made terraform rod respect world specific sea level. Closes #102 2016-02-06 23:54:28 -06:00
Vincent Lee fe1d88379d Fix AABB derp in rod of the skies, closes #98 2016-02-06 22:54:40 -06:00
Vincent Lee 8cf71200ee More lexicon faffing 2016-02-06 22:39:43 -06:00
Vincent Lee 26bc6b0059 Split out alt resources 2016-02-06 15:57:16 -06:00
Vincent Lee b6f51f1ccf Preliminary work on lexicon first person model 2016-02-05 19:57:29 -06:00
Vincent Lee 7e642cb03a Mop check for multiblocks. Closes #95 2016-02-05 15:54:42 -06:00
Vincent Lee 75ce19ddc6 Fix querying itemless blocks, closes #90 2016-02-05 15:52:44 -06:00
Vincent Lee 6f6f330a5a Fix lexicon npe, closes #94 2016-02-05 15:50:46 -06:00
Vincent Lee eedfff10f1 Fix the warp ward recipe 2016-02-05 15:47:28 -06:00
Vincent Lee 65fe04af3a Restore thaumcraft integration. Closes #74 2016-02-05 13:36:59 -06:00