Commit Graph
4820 Commits
Author SHA1 Message Date
Vincent Lee b3ee6dcf7a More cleanup, brews now average their potion colors instead picking the first 2016-04-12 00:51:09 -05:00
Vincent Lee 69cbecb521 More cleanup, Full pool for JEI handlers 2016-04-11 23:22:02 -05:00
Vincent Lee effd07129c A round of FindBugs, and fix red interceptor not working at all 2016-04-11 22:47:24 -05:00
Vincent Lee e73feae688 Tweak horse inv dropping again 2016-04-11 21:44:30 -05:00
Vincent Lee cee7a965a5 Tweak horse inv dropping 2016-04-11 21:17:42 -05:00
Vincent Lee 07f3099071 Force relay tweaks, hopefully resolves #232 2016-04-11 20:55:11 -05:00
Vincent Lee 70cc32a839 Add RenderFull NBT tag override to pools. Closes #228 2016-04-11 20:18:41 -05:00
Vincent Lee 50eeb06bf6 Remove useless line. Make horse drop all items when being virused, closes #189 2016-04-11 19:43:18 -05:00
Vincent Lee d97b2ceb1d Fix pool's north wall being slightly taller, Fix pump item model 2016-04-09 22:43:50 -05:00
Vincent Lee 209970b60c Fix bauble box gui. Closes #185 2016-04-09 21:37:41 -05:00
Vincent Lee 5cdf48393a Fix top half of double flowers not sparkling with correct color. Also disable random offsetting because it's broken 2016-04-09 21:25:41 -05:00
Vincent Lee 533a287bd3 Allow vanilla flowers to be ground directly into powder. Closes #215 2016-04-09 21:03:51 -05:00
Vincent Lee 7c61b1b9d3 Misc cleanup, fix hud catalyst, test gpg sign 2016-04-09 20:26:04 -05:00
Vincent Lee 4a9c269a67 Clean up terra firma rod code 2016-04-08 13:24:44 -05:00
Vincent Lee 1a7e128ae5 Merge pull request #224 from yrsegal/19FixTerraformRod
Fix the Rod of the Terra Firma not working
2016-04-08 12:59:00 -05:00
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
Jonathan Smith 3fb76acf57 Merge pull request #1835 from elbo2525/master
Update ja_JP.lang
2016-04-07 09:42:02 +01:00
elbo2525 2471642df7 Update ja_JP.lang 2016-04-07 15:53:52 +09:00
yrsegal 39a44642e4 Fix the Rod of the Terra Firma not working
Closes #191
2016-04-06 18:58:39 -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