Commit Graph
4452 Commits
Author SHA1 Message Date
Vincent Lee be09676053 Use == 2016-04-08 12:37:13 -05:00
Vincent Lee 11d327dcce Merge branch 'MC19' of github.com:williewillus/Botania into MC19 2016-04-08 12:32:59 -05:00
Vincent Lee 5df661bf28 Merge pull request #227 from yrsegal/Catalysts
Catalysts can accept any catalyst BlockState.
2016-04-08 12:32:41 -05:00
yrsegal fa8c12d6fc Catalysts can accept any catalyst BlockState.
This constitutes a major, but not breaking, API update. All catalyst
methods previously in RecipeManaInfusion have been deprecated.
2016-04-07 21:50:28 -04:00
Vincent Lee bcecfb9148 Merge pull request #222 from yrsegal/19FixMunchdew
Fix munchdew not working
2016-04-06 17:43:06 -05:00
yrsegal 1f11359b23 Fix munchdew not working
Closes #220
2016-04-06 18:14:07 -04:00
Vincent Lee 4ec22a0417 Merge upstream 2016-04-06 09:51:50 -05:00
Vincent Lee 8a6189cbd2 Fix mana tablet rendering 2016-04-06 09:48:28 -05:00
Vincent Lee 796d231867 Fix wall digging textures 2016-04-05 13:20:37 -05:00
Vincent Lee fb0a414443 Rename build to fix stupid issues 2016-04-05 08:51:10 -05:00
Vincent Lee ae57ace7e8 Fix spreader item model, misc fixes, update forge to 1841 so all interact events are back 2016-04-04 21:03:12 -05:00
Vincent Lee f011be3571 Switch last commit to shaders. Thanks PaleoCrafter! 2016-04-04 13:32:36 -05:00
Vincent Lee 109d045a4d Fix ugly multiblock rendering 2016-04-04 13:09:02 -05:00
Vincent Lee 32fb1bcf6d Fix contributor renders. Closes #200 2016-04-04 09:47:02 -05:00
Vincent Lee 529c41407f Allow mana guns to be dual wielded 2016-04-04 09:30:52 -05:00
Vincent Lee ea6484211b API cleanups 2016-04-03 23:26:20 -05:00
Vincent Lee 53ce019cf5 Various misc cleanups 2016-04-03 23:07:24 -05:00
Vincent Lee eec7c8ba59 Fix missing center model for panes. Closes #208 2016-04-03 21:25:55 -05:00
Vincent Lee c07febc67d Merge branch 'MC19' of github.com:williewillus/Botania into MC19 2016-04-03 21:23:18 -05:00
Vincent Lee 08550cc442 Cleanup 2016-04-03 21:23:04 -05:00
Vincent Lee 82fa306a5c Merge pull request #207 from yrsegal/19Patch
Fix invalid color combination
2016-04-03 21:03:21 -05:00
yrsegal 63a5bdee1c Fix invalid color combination 2016-04-03 21:54:36 -04:00
Vincent Lee f8157f1222 Fix erratic colorization of bursts and flashes
Fix erratic colorization of bursts and flashes
2016-04-03 20:50:14 -05:00
yrsegal 7536ebe4c6 Fix erratic colorization of bursts and flashes
closes #198
2016-04-03 21:38:42 -04:00
Vincent Lee af19c7cece Update kekimurus for extra slice of cake in 1.8 2016-04-03 20:23:05 -05:00
Vincent Lee 43395f9441 Fix walls appearing in vanilla creative tab. Closes #190 2016-04-03 20:08:58 -05:00
Vincent Lee 97495a913d Cleanup walls 2016-04-03 19:59:58 -05:00
Vincent Lee 1d901ec9ac Fix panes. Closes #204 2016-04-03 19:39:05 -05:00
Vincent Lee 62b39ee682 Fix crash serverside. Closes #197 2016-04-03 19:00:20 -05:00
Vincent Lee 759bf2835d Merge branch 'MC19' of github.com:williewillus/Botania into MC19 2016-04-03 18:47:57 -05:00
Vincent Lee 69db133091 Update forge 2016-04-03 18:47:31 -05:00
Wire Segal 5ceceec6bb Various minor fixes
* Fix Lexicon crashing with invalid version format

Closes #192

* Fix crashing on damage taken

Closes #196

* Fix attributes being too present/wrong values

Closes #194
2016-04-03 17:01:24 -05:00
Vasco Lavos e122e5252c Update contributors.properties 2016-04-02 21:39:55 +01:00
Vincent Lee 5f3172bd5d Cleanup, fix soulscribe holding 2016-04-01 16:51:30 -05:00
Vincent Lee 79c8e3d695 various miscellaneous fixes r1.8-300-ALPHA 2016-03-31 01:09:46 -05:00
Vincent Lee f5b435bf24 Model cleanup 2016-03-30 23:26:06 -05:00
Vincent Lee b6d607b553 Bow tweaks 2016-03-27 14:07:27 -05:00
Vincent Lee d411fac65c Half fix floating flowers 2016-03-27 13:35:12 -05:00
Vincent Lee 9bc724d6fd Fix flower models 2016-03-27 12:45:48 -05:00
Vincent Lee bcd00dbba3 Update JEI, more overrides 2016-03-27 12:05:19 -05:00
Vincent Lee c8531fde67 Update forge, some more model overrides 2016-03-27 00:30:45 -05:00
Vincent Lee 4771ec5bdb Some item overrides, fix bow firing 2016-03-24 14:41:10 -05:00
Vincent Lee ecb0f8a4be Fix bow models 2016-03-24 13:47:58 -05:00
Vincent Lee ab618923df Fix some methodhandles 2016-03-24 13:01:07 -05:00
Vincent Lee 674ba5c19d Fix somde models 2016-03-24 12:30:14 -05:00
Vincent Lee 1b87160ef6 Register the potions 2016-03-24 09:45:56 -05:00
Vincent Lee ec419edfe3 Fix sounds 2016-03-24 09:13:15 -05:00
Vincent Lee 5b9a5bf480 Update most reflection names 2016-03-24 00:02:36 -05:00
Vincent Lee 1b79575648 Fix other models 2016-03-23 23:47:06 -05:00
Vincent Lee 0ba32450cf Fix stairs 2016-03-23 23:31:08 -05:00