Commit Graph
3925 Commits
Author SHA1 Message Date
Vincent Lee 3aef9efe8b Floating flowers kinda sorta mostly working 2015-12-29 00:34:13 -06:00
Vincent Lee 8f70814ae6 Partially working floaters 2015-12-28 22:21:22 -06:00
Vincent Lee 43cd84d2cd Fix multiblock rendering and enchanter activation bug 2015-12-28 19:11:20 -06:00
Vincent Lee 2f0915e18c Lots more item models, red string block models 2015-12-28 17:50:33 -06:00
Vincent Lee 8eedaa5563 Fix texture errors, fix pool and apothecary collision detection 2015-12-28 16:11:01 -06:00
Vincent Lee b701f197ee Some progress on floating flowers 2015-12-28 14:17:10 -06:00
Vincent Lee bf07f10ac7 Fix brewery rendering and operation 2015-12-27 22:38:26 -06:00
Vincent Lee 90fcc98bd0 Fix wisp particle 2015-12-27 20:33:24 -06:00
Vincent Lee c513f17f88 All brews, mana tablet, mana gun, incense, and other items 2015-12-27 20:16:31 -06:00
Vincent Lee e83d1600cf Blood pendant, enchanted soil, enchanter, open bucket, prism, fix some rendering 2015-12-27 16:52:30 -06:00
Vincent Lee 5b1ac0368d Quartz, prismarine, various items, fix upper slab uvlock 2015-12-27 15:39:45 -06:00
Vincent Lee 65837fbf38 Punt on apothecary. Items first 2015-12-27 12:52:02 -06:00
Vincent Lee 33a8d5e33c Done with apothecaries for today >.> 2015-12-27 01:51:06 -06:00
Vincent Lee b740a22684 Fix old tex, temporary json 2015-12-27 00:42:24 -06:00
Vincent Lee 7c41ffcaa1 Destitched model files 2015-12-27 00:26:41 -06:00
Vincent Lee 781f586d19 Upload some files so I can use modelcreator in windows >.> 2015-12-26 21:55:32 -06:00
Vincent Lee 794e1352e8 Lenses and lens rendering on spreader 2015-12-26 20:00:34 -06:00
Vincent Lee f449fca882 Actually commit this time 2015-12-26 17:41:50 -06:00
Vincent Lee 73663e8a0a Fix rod models, made runic altar and avatar render their items 2015-12-26 17:38:07 -06:00
Vincent Lee 86cd656360 Merge branch 'MC18' of github.com:williewillus/Botania into MC18 2015-12-26 16:27:00 -06:00
Vincent Lee 20b433af3c Merge pull request #2 from primetoxinz/MC18
More Item Models :D
2015-12-26 16:22:09 -06:00
Vincent Lee 5fe696875f More various models 2015-12-26 16:21:21 -06:00
primetoxinz 18dceeeb5f fix for merge 2015-12-26 16:43:32 -05:00
Tyler ccbf325a76 Merge pull request #2 from williewillus/MC18
Merge
2015-12-26 16:32:18 -05:00
Vincent Lee 2f4785c7b4 Clean up flower and mushroom jsons 2015-12-26 12:35:46 -06:00
Vincent Lee e2ac5ecad1 Fix double flowers fully, a couple more models 2015-12-26 00:49:30 -06:00
Vincent Lee 8cda41cdb8 Finish walls, and ALL slabs. Made floating flowers render properly in world. 2015-12-25 22:44:10 -06:00
Vincent Lee b36f51f6d8 Clean up a ton of models, add some walls 2015-12-24 22:00:24 -06:00
Vincent Lee 32fe7f6ce3 Fix landing and break particles in specail flowers 2015-12-24 15:05:52 -06:00
Vincent Lee 0687f56c32 Tentatively change relics to use UUID. Still use playernames for display 2015-12-24 14:42:52 -06:00
Vincent Lee 70d4450a6a Wand of the Forest, Fel pumpkin, trodden path 2015-12-24 14:00:11 -06:00
Vincent Lee dcd08963e9 Special item models 2015-12-24 12:33:25 -06:00
Vincent Lee 23cab39892 All special flowers. item model system not yet done 2015-12-24 11:05:00 -06:00
Vincent Lee f4ea60ba2c IT WORKS 2015-12-24 03:04:16 -06:00
Vincent Lee 319bab35a0 Lay all groundwork for special flower models. Not yet tested. 2015-12-24 02:14:21 -06:00
Vincent Lee d58f153742 Solid vine and crash fixes for it 2015-12-23 23:54:59 -06:00
Vincent Lee 64a8dfbcfe Drums, runic altar, mana pool kinda, distributor, force relay, starfield 2015-12-23 20:26:33 -06:00
Vincent Lee eabb0f94e3 Mana beacon, unstable block, petal block 2015-12-23 17:19:23 -06:00
primetoxinz d23cca33e1 More Item models 2015-12-23 17:07:32 -05:00
Tyler cbbefff0ce Merge pull request #1 from williewillus/MC18
merge
2015-12-23 17:03:30 -05:00
Vincent Lee cfaeecc41a Panes, and fixes so no crashes in debug world 2015-12-23 16:03:07 -06:00
Vincent Lee 0887191a64 All stair models done 2015-12-23 14:30:18 -06:00
Vincent Lee b10615c909 Revert unnecessary changes 2015-12-23 00:42:00 -06:00
Vincent Lee 2c660ba82b Merge branch 'primetoxinz-MC18' into MC18 2015-12-23 00:40:40 -06:00
Vincent Lee 92e90ed2b9 Merge branch 'MC18' of github.com:primetoxinz/Botania into primetoxinz-MC18 2015-12-23 00:39:40 -06:00
Vincent Lee 3d41be585b Pylons kinda working 2015-12-22 23:26:27 -06:00
Vincent Lee 57e5a3d0ac Pylon obj model possibly. item working, tile not so 2015-12-22 22:47:29 -06:00
primetoxinz 1b1e5e3bf0 Fixed Formatting 2015-12-22 23:34:35 -05:00
primetoxinz 7e0145bf34 remove debug code, whoops 2015-12-22 23:17:09 -05:00
primetoxinz e77678593f remove launch files 2015-12-22 23:09:21 -05:00