Commit Graph
6985 Commits
Author SHA1 Message Date
Vincent Lee 18359eb58e Fix some bugs when logging into world 2020-06-28 16:49:42 -05:00
Vincent Lee 23f3213daf Fix attribute modifiers 2020-06-28 16:19:41 -05:00
Vincent Lee f7785a0a54 Merge branch 'master' of github.com:Vazkii/Botania into 1.16.x 2020-06-28 16:02:40 -05:00
Vincent Lee 368a67cc46 Fix worldgen 2020-06-28 16:02:32 -05:00
Vincent Lee 3eaf807132 Fix all remaining non-worldgen compile errors 2020-06-28 15:47:31 -05:00
Vincent Lee d9f444eab4 Fix a bunch of smaller compile errors 2020-06-28 15:23:48 -05:00
Vincent Lee 15ad0ed530 Fix boss bar renderer, konami renderer, give particles codecs, fix sky renderer 2020-06-28 14:33:45 -05:00
Vincent Lee cf7ef9a96f 'Fix' chunkgenerator and worldtype 2020-06-28 14:08:55 -05:00
Vincent Lee 5484cfc815 Restore JEI and compat 2020-06-27 21:02:40 -05:00
Vincent Lee 7ab7690c89 Fix particle consturctors 2020-06-26 21:08:22 -05:00
Vincent Lee 60521cf013 Fix guis 2020-06-26 21:06:53 -05:00
Vincent Lee 9f8a646854 Fix projectile throwers, narslimmus seed 2020-06-26 20:57:29 -05:00
Vincent Lee f430df39f2 Fix patchouli integration components 2020-06-26 20:54:59 -05:00
Vincent Lee 26103c00ae Fix other datagenerators 2020-06-26 20:48:49 -05:00
Vincent Lee b7aa7134b8 Fix recipeprovider 2020-06-26 20:34:52 -05:00
Vincent Lee 48a2b1ac1e Comment out curious integration 2020-06-26 20:29:48 -05:00
Vincent Lee 351781d43e Fix renderlexicon 2020-06-26 20:29:40 -05:00
Vincent Lee 873850148c Fix dispose modifier, move JEI integration to disabled folder 2020-06-26 20:17:32 -05:00
Vincent Lee 6f131499c8 readd patchouli 2020-06-26 20:15:38 -05:00
Vincent Lee a84e6349d5 666 errors 2020-06-26 12:23:28 -05:00
Vincent Lee 2fc16d628d More work 2020-06-26 11:27:05 -05:00
Vincent Lee 17ccb624f8 Lots of work 2020-06-26 09:59:25 -05:00
Vincent Lee 98b74dc69b Fixes all around, Vec3d -> Vector3d 2020-06-25 19:24:52 -05:00
Vincent Lee 2db83d754f update gradle 2020-06-25 19:07:27 -05:00
Al Winfy 595cf74f09 Use Gourm pitch to give feedback on streak length/displeasure (#3339)
* Use Gourm pitch to give feedback on streak length

* Document eats
2020-06-25 14:50:18 -05:00
Hubry cb5a8a1b07 Fix derp with registering soul cross instead of other effects 2020-06-25 19:54:38 +02:00
Vincent Lee 2303c4056c More portability stuff and cleanups 2020-06-24 20:41:27 -05:00
Vincent Lee 75a4dd16cc Convert forge has/createTileEntity back into ITEP for portability.Once upon a time this was 'best practice' but it never seemed to provide any benefit. 2020-06-24 20:17:53 -05:00
Vincent Lee 7c77a31347 Register potions the portableish way 2020-06-24 18:13:17 -05:00
Hubry fdfc715cef Fix up formatting after objectholder pr 2020-06-25 00:34:42 +02:00
Al Winfy c8d6bcd70e Allow the Gourmaryllis to reward longer "streaks" of foods (#3335)
* Allow the Gourmaryllis to reward longer "streaks" of foods

* Document streaks in lexica entry

* Fix bug where the first dupe food sneaks by free

* Move some logic to where it actually belongs
2020-06-24 16:38:48 -05:00
MoriyaShiine 94841df9aa de-objectholder blocks (#3336) 2020-06-24 16:12:41 -05:00
Vincent Lee b260b74ba8 Register brews using the util method 2020-06-23 12:39:53 -05:00
Hubry 6d36357bce Formatting: newline after field annotation, align javadoc tags per type 2020-06-23 19:21:55 +02:00
Vincent Lee 1353e77a19 Fix #3316 2020-06-23 12:20:13 -05:00
MoriyaShiine 79658cabb7 de-objectholder items (#3334)
* de-objectholder tiles

* thank you willie very cool

* a world of nightmares never seen before
2020-06-23 12:05:06 -05:00
Vincent Lee 2c676c5e05 Fix bug in recipe generator 2020-06-23 08:47:08 -05:00
Vincent Lee aaf982cd48 Update forge, restore gog sky renderer 2020-06-23 08:45:16 -05:00
MoriyaShiine ca69049842 de-objectholder tiles (#3333)
* de-objectholder tiles

* thank you willie very cool
2020-06-22 20:14:38 -05:00
Vincent Lee 5899036f44 De-objectholderify particles and containers 2020-06-22 18:35:54 -05:00
Vincent Lee ec91903ff9 De-objectholderify entities 2020-06-22 18:30:41 -05:00
Vincent Lee f05ca91f09 Remove nearly all usages of getRegistryName, replacing with vanilla method 2020-06-22 18:09:10 -05:00
Vincent Lee daa1201e7f Interchange arguments to ModBlocks.register to match the vanilla signature, for future portability 2020-06-22 17:33:36 -05:00
Vincent Lee 7e676f081f Move all eventbussubscribers to explicit addListener calls for future portability purposes. Optimize imports. 2020-06-22 17:01:26 -05:00
Vincent Lee 99ce86bb35 Convert bytes to hex manually instead of using random xml lib to do it. Fixes running on java 11+ 2020-06-19 19:59:00 -05:00
Vincent Lee 9c1f21adc6 Update/doc vanilla crit logic in terrasteel helm to match vanilla 2020-06-17 08:46:14 -05:00
Vincent Lee 04a8c183c7 Build 386 2020-06-17 08:33:36 -05:00
Vincent Lee 633fe72f7f Fix sidedness issue, closes #3328 2020-06-17 08:30:39 -05:00
Vincent Lee 21eb7f8bf7 Build 385 2020-06-15 18:36:14 -05:00
Vincent Lee 1cefe8c078 Some rendersystem substitutions I missed 2020-06-15 09:19:58 -05:00