Compare commits

...
2182 Commits
Author SHA1 Message Date
Vincent Lee 5d9ccbcccf Bump patchouli dep 2020-07-16 10:38:32 -05:00
Vincent Lee 8141c37897 Replace some things with textcomponents in Patchouli integration 2020-07-15 14:09:40 -05:00
Vincent Lee 4bd4a05fee Fix drop hint in mana infusion 2020-07-15 13:56:58 -05:00
Vincent Lee 90758cd596 Make radius overlays respect fabulous graphics, fix floating special flower render 2020-07-15 12:23:27 -05:00
Vincent Lee 64274319b6 Move landmine radius render into its own renderer, get rid of BlockHighlightRenderHandler 2020-07-15 12:13:11 -05:00
Vincent Lee 17f1fd5977 Move radius rendering into a TESR for the special flowers 2020-07-15 11:41:33 -05:00
Vincent Lee 3b33dedc3d Fix texture state leak 2020-07-15 10:58:47 -05:00
Vincent Lee dff762055d Give up on lightning fixing for now 2020-07-15 10:32:34 -05:00
Vincent Lee ae8fbd29e6 Separate segment generation from lightning particle itself 2020-07-14 17:08:18 -05:00
Vincent Lee 4d71707a3a Half-fix lightning particle 2020-07-14 16:21:27 -05:00
Vincent Lee 3074a2d5b8 Delete some old unused textures 2020-07-14 15:31:05 -05:00
Vincent Lee caefa0851a Adjust king key weapon rendering 2020-07-14 15:30:15 -05:00
Vincent Lee f1f5dc81b8 Fix king key weapons despawning clientside while charging 2020-07-14 14:56:10 -05:00
Vincent Lee ecadc618f7 Switch from forge item use tick callback to vanilla's 2020-07-14 11:02:34 -05:00
Vincent Lee 4a8661bcac More cleanup 2020-07-14 10:20:40 -05:00
Vincent Lee 81e5615ab4 World seed only works in overworld for now 2020-07-14 10:16:46 -05:00
Vincent Lee e71a62f0f8 Bump forge, reorganize gog seed inject so the table is separate from the loot modifier 2020-07-14 10:15:09 -05:00
Vincent Lee 4b8d5c2a33 Bump mods.toml and gradle for gog 2020-07-14 09:22:11 -05:00
Vincent Lee 977a4fa9e3 Move pebble sources tag to gog 2020-07-14 09:08:17 -05:00
Vincent Lee 80c40ca7b9 Increment pack.mcmeta versions 2020-07-14 08:56:53 -05:00
Vincent Lee 6c6bb0dc64 Fix garden of glass except for some visuals 2020-07-13 23:06:13 -05:00
Hubry 50a0ced86b Fix GoG dye recipe, remove brass to cacophonium recipe 2020-07-13 21:17:22 +02:00
Hubry 069cb964b6 Fix packet serialization of block tag ingredients
Fixes pure daisy JEI display on servers
2020-07-13 16:12:55 +02:00
Hubry d4f6e1e859 Fix criteria triggers and advanced loot tables on servers 2020-07-13 16:06:19 +02:00
Vincent Lee ff46aa2ac0 Increment build number 2020-07-10 18:58:53 -05:00
Vincent Lee 12ba6fc9ca Fix advancement backgrounds and alfheim swirl in lexicon 2020-07-10 17:30:58 -05:00
Vincent Lee a32096ad71 Fix crafting_multi rendering 2020-07-10 17:27:19 -05:00
Vincent Lee 37121e06ce Don't gate mana tablet render on curios, fix inverted condition 2020-07-10 09:40:58 -05:00
Vincent Lee 5244e7425e Bump patchouli version to avoid log spam 2020-07-10 09:11:33 -05:00
Vincent Lee 2b1c003b62 Fix tileentity markDirty() methods accessing the world when it may not be available. Fixes #3352 2020-07-10 09:04:57 -05:00
Vincent Lee 98b93ddce9 Update stale message, automatically remove stale when bumped.
Also remove a stray import.
2020-07-09 22:21:01 -05:00
Vincent Lee 0310cbd69e Revert ore weight registration to API calls instead of IMC. Register netherite (though there's no forge ore tag for it yet) 2020-07-09 13:59:02 -05:00
Vincent Lee 1522d8bbb3 Remove a bunch of todos I don't really care about 2020-07-09 13:36:20 -05:00
Vincent Lee 77a2fa15fe Remove all thaumcraft stuff. F. 2020-07-08 22:04:48 -05:00
Vincent Lee 79c3aeb3f9 increment build number for next iteration 2020-07-08 21:17:48 -05:00
Vincent Lee 6500ce929e Remove 'r' from version string 2020-07-08 21:12:48 -05:00
Vincent Lee bad05de72f Re-implement crafting halo.
Instead of remembering the exact inputs and outputs, the recipe ID is now saved.
This allows e.g. tag ingredients to be matched and used.
Ingredients are found and extracted from the inventory using the same methods as the recipe book.
2020-07-08 21:10:19 -05:00
Hubry 919d3f94a9 Bump mappings to 20200707-1.16.1 2020-07-07 20:08:01 +02:00
Vincent Lee 0339191502 Fix various bugs from the iinventory back-migration 2020-07-06 22:14:09 -05:00
Vincent Lee d5fe3bac16 merge 1.15 2020-07-06 21:32:52 -05:00
Vincent Lee 24937e64ce Fix name clash in TileSimpleInventory 2020-07-06 21:29:29 -05:00
Vincent Lee e372f903cd Shave some legacy crap off Vector3, change some places to use vanilla's class instead, now that it's available on both sides 2020-07-06 21:20:03 -05:00
Vincent Lee 9269aeb73d Refactor getAccesoriesInventory to use vanilla interface 2020-07-06 20:38:44 -05:00
Vincent Lee b631775c32 Remove floral powders in favor of the generic vanilla dyes 2020-07-05 18:04:50 -05:00
Hubry 6a64ceb169 Fix duplicate loader registration on resource reload 2020-07-05 21:03:51 +02:00
Hubry d85dbcfbf8 Bump Forge, replace GoG grass loot table inject with loot modifier
Closes #3342
2020-07-05 21:03:51 +02:00
Vincent Lee 57f910f067 Fix rune altar cube diffuse lighting. 'Fix' the positioning 2020-07-04 18:06:48 -05:00
Vincent Lee dbc2bd609f Make icon overlay layers render offscreen, fix spark icons not spinning properly 2020-07-04 17:11:49 -05:00
Vincent Lee dc74b617e7 Update pylons to respect fabulous graphics 2020-07-04 16:50:05 -05:00
Vincent Lee 3cff9c4036 Increment ver for next iteration 2020-07-03 21:32:20 -05:00
Vincent Lee f83a97cb7a Merge 1.15 2020-07-03 21:30:57 -05:00
Vincent Lee 4c3097b85e Disable pixie event handler for now 2020-07-03 21:27:59 -05:00
Vincent Lee ac7d284818 format 2020-07-03 21:20:12 -05:00
Vincent Lee b9e4f33b88 Generate all itemblock models 2020-07-03 21:18:40 -05:00
Vincent Lee 512945af89 Fix three high template model, fix floating flower blockstates being deleted accidentally 2020-07-03 19:02:58 -05:00
Vincent Lee 00b0b63262 All blocks now datagenned as much as possible 2020-07-03 17:37:10 -05:00
Vincent Lee 7db19cb6eb generate more stuff 2020-07-03 17:23:04 -05:00
Vincent Lee 20330c7c55 Generate crates, spreaders, drums 2020-07-03 17:05:08 -05:00
Vincent Lee f3022e3cf5 Generate even mroe stuff 2020-07-03 16:28:09 -05:00
Vincent Lee a9a0792d14 Datagenerate quartzes and panes 2020-07-03 15:54:50 -05:00
Vasco Lavos 50da75abb3 Update contributors.properties 2020-07-03 18:23:39 +01:00
Vincent Lee c55af7f190 Mark prism as manual model, use vanilla tag for beacon bases 2020-07-03 12:21:04 -05:00
Vincent Lee 2404503e1b Generate fences, gates, elfglass, fix fel pumpkin 2020-07-03 12:01:52 -05:00
Vincent Lee 9299e754c0 Generate more stuff 2020-07-03 11:51:28 -05:00
Vincent Lee 591f5e2c99 Datagenerate all slab and stair models 2020-07-03 11:22:08 -05:00
Vincent Lee 6f3b9f4056 Datagenerate apothecary block models 2020-07-03 10:56:49 -05:00
Vincent Lee 89511cc160 Datagenerate all metamorphic block models 2020-07-03 10:42:11 -05:00
Vincent Lee 939b41e2c9 Change apothecary fluid to be stored in the blockstate
There are a couple benefits to this:
- Light method no longer relies on forge method
- Fluid changes detectable by observer
- Tighter API (only take accepted fluids)
2020-07-02 21:44:19 -05:00
Vincent Lee 44a7d61956 Make block fields all final 2020-07-02 21:24:04 -05:00
Hubry 29686ede7b Put curio integration back
Curio rendering is handled by Curios again, gives us support for
hiding them for free. The method is a little bit ugly but I'd rather
avoid copying the logic that Curios has every time it changes
2020-07-02 23:56:08 +02:00
Vincent Lee 8b31cce0ef Update deps 2020-07-02 10:53:01 -05:00
Vincent Lee afb6ee8b0e Don't append build number 2020-07-02 10:42:21 -05:00
Vincent Lee ae057df66f Bump version to 1.16, fix maven publishing and clean up gradle more 2020-07-02 10:39:31 -05:00
Vincent Lee 5f23cf5506 Set gradle project name, use snapshot versioning, remove sortArtifacts 2020-07-02 10:29:30 -05:00
Vincent Lee 88e3d8ffc0 datagenerate block models for particle-only tesrs 2020-07-01 23:16:24 -05:00
Al Winfy 0dff00c506 Update to Vazkii/Patchouli#225 spec (#3340)
* Update to the new Patchouli IVariable system

* missed a spotless
2020-07-01 22:04:20 -05:00
Hubry 991198118b Format 2020-07-01 23:58:59 +02:00
Hubry 972a73ec1e Delete some unused textures 2020-07-01 23:51:34 +02:00
Hubry 3eff77af32 Rename misc textures 2020-07-01 23:51:34 +02:00
Hubry 410f303370 Rename mana device textures 2020-07-01 23:51:33 +02:00
Hubry 03b1d52083 Rename quartz block textures 2020-07-01 23:49:07 +02:00
Hubry 9ca7cef5de Rename livingwood and dreamwood textures 2020-07-01 23:49:06 +02:00
Hubry d179f80b8b Rename livingrock textures 2020-07-01 23:49:05 +02:00
Hubry f08dd37bfb Rename metamorphic stone textures 2020-07-01 22:28:35 +02:00
Vincent Lee ef51fd2ff6 Start refactoring blockstate provider
Datagenerate alt grass block models

Datagenerate mystical and shiny flower models

Make buried petals not extend BlockModFlower

Datagenerate double flower models
2020-06-30 12:24:05 -05:00
Vincent Lee 08a5dde75b Release 1.15-387 2020-06-30 10:25:43 -05:00
Vincent Lee eac3d1c36d Yeet 2020-06-30 10:10:50 -05:00
Vincent Lee bae7158ebb Reformat 2020-06-29 22:33:10 -05:00
Vincent Lee 6c0f99ca93 Generate mystical mushroom models 2020-06-29 22:33:10 -05:00
Vincent Lee 78317f6c2a Generate red string blocks' models 2020-06-29 22:33:10 -05:00
Vincent Lee 967e88e160 Run item model generator after blocks 2020-06-29 22:33:10 -05:00
Vincent Lee f505829686 Update forge, fix datagens by generating special flower tags 2020-06-29 22:33:10 -05:00
Vincent Lee 4e561a4f99 Yeet 2020-06-29 22:33:10 -05:00
Vincent Lee 48c4cad2b5 Rename specialflower textures and generate their block/item models 2020-06-29 22:33:10 -05:00
Hubry 7da5552cc1 Run format 2020-06-29 22:02:45 +02:00
Hubry 09be139b0e Rearrange configs into more logical categories 2020-06-29 22:02:31 +02:00
Vincent Lee 4fb02e5b94 Rename blocks and items texture folders 2020-06-29 12:23:28 -05:00
Vincent Lee 762085b990 Fix elven trade JEI display, adjust runic altar JEI mana bar to not stick out of box 2020-06-29 12:02:55 -05:00
Vincent Lee 4bbf5fe08d De-capify bauble box, pull inv sizes to constants 2020-06-29 11:56:07 -05:00
Vincent Lee 66bd3ae399 Un-capify flower bag 2020-06-29 11:45:01 -05:00
Vincent Lee 27cc19acff Document calls to renderItemIntoGUI that will need changing in the future 2020-06-29 11:10:42 -05:00
Hubry fba84e11a1 Remove no longer needed reflection for entity type tags 2020-06-29 17:52:52 +02:00
Hubry 9c20dccaf2 Fix wall models and duplicate loader registration on resource reload 2020-06-29 17:48:03 +02:00
Hubry 73630f11e1 Merge remote-tracking branch 'origin/master' into 1.16.x 2020-06-29 15:17:05 +02:00
Vincent Lee 7b60e8ccf5 Optimize imports and format 2020-06-28 23:23:41 -05:00
Vincent Lee b1dba3d999 Use ID's for paintable block registration instead of registry delegates 2020-06-28 23:20:40 -05:00
Vincent Lee 986ccfd670 Expose brew registry as a vanilla one, with some underhanded tricks 2020-06-28 23:10:48 -05:00
Vincent Lee b159df01cf Remove usages of forge ItemHandlerHelper that can be done using vanilla 2020-06-28 22:29:09 -05:00
Vincent Lee 95ab01022f Expose the automation inventories that should be exposed 2020-06-28 22:14:02 -05:00
Vincent Lee 1980958c67 Primal Reversion: IItemHandler -> IInventory in tile entities 2020-06-28 21:51:54 -05:00
Vincent Lee 30e91eec9b Fix all redundant hardcoding of modid 2020-06-28 20:31:33 -05:00
Vincent Lee bcecfa188c Merge internalhandler and api together 2020-06-28 20:29:01 -05:00
Vincent Lee 0f9e759307 Clean up compat for dead mods 2020-06-28 19:41:48 -05:00
Vincent Lee 3530a2de69 Change api recipe interfaces to use IInventory, reformat 2020-06-28 16:55:34 -05:00
Vincent Lee 18359eb58e Fix some bugs when logging into world 2020-06-28 16:49:42 -05:00
Hubry badd394b26 Fix floating hopperhock and regen data
Irritatered at Moriya.
2020-06-28 23:47:50 +02: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
Vincent Lee 391f434634 Remove a few unnecessary eventbussubscribers 2020-06-15 09:19:58 -05:00
Vincent Lee 49fd323ad2 Change some stuff to be closer to vanilla, for future potential portability reasons 2020-06-15 09:19:58 -05:00
Vasco Lavos c3db981676 Update contributors.properties 2020-06-15 10:41:48 +01:00
Vincent Lee 8f7448412c Fix pure daisy completion particles being missing 2020-06-13 10:43:37 -05:00
Vincent Lee 8e499b710d Remove a bunch of redundant markdirty and updateComparator calls, the former causing network spam and the latter just being unnecessary 2020-06-13 10:38:26 -05:00
Vincent Lee 267e4da7cd Fix formatting 2020-06-12 10:00:12 -05:00
Vincent Lee f2f6cdba41 Remove world, pos override of dispatchTE, which requeries the TE and thus is laggier 2020-06-12 09:07:31 -05:00
Vincent Lee 4d7defad63 Remove some more unneeded syncs 2020-06-12 09:02:44 -05:00
Vincent Lee 6da5699efb IWandBindables are now responsible for syncing themselves after a binding instead of the wand doing it 2020-06-12 08:46:22 -05:00
Vincent Lee fbba1ffe7e Use vanilla keybind textcomp to get key names instead of our own method 2020-06-11 23:02:31 -05:00
Vincent Lee 00ec6f8b08 Brighten hopperhock hud, unify shift tooltip handling and fix the coloring for it 2020-06-11 23:02:31 -05:00
Al Winfy cbc36366de Fix all (non-deprecation) compiler warnings (#3321)
* Fix all (non-deprecation) compiler warnings

* satisfy spotless

* use a method ref over a lambda
2020-06-07 21:48:55 -05:00
Vincent Lee a01f3fed15 bat 2020-06-05 21:09:24 -05:00
Vasco Lavos 1b95d44660 Update contributors.properties 2020-06-04 22:32:54 +01:00
youyihj 3c2a001b18 Fix several translate mistake (#3317) 2020-05-30 23:08:36 -05:00
Vasco Lavos c1149ed3de Update contributors.properties 2020-05-30 18:01:14 +01:00
Vincent Lee 5406c99d1a new quark feature 2020-05-28 17:30:32 -05:00
Vasco Lavos 2e2cd8f88b Update contributors.properties 2020-05-26 16:05:53 +01:00
Determancer 24715c509e Update zh_cn.json (#3310)
tweaks
2020-05-23 11:43:02 -05:00
Vasco Lavos 32d5e16c9f Update contributors.properties 2020-05-22 10:30:38 +01:00
Vincent Lee 09bb48a663 Move special flowers out of vanilla #small_flowers to #flowers. Fixes #3285 endermen picking them up 2020-05-21 16:52:26 -05:00
Vincent Lee 4e839b96a7 Add tall mystical flowers to vanilla tag, fixes #3295. Regenerate data. 2020-05-21 16:21:53 -05:00
Zinkorrum bd0dfdda33 Fix mistakes in ru_ru lang file (#3293)
* Fix mistake in lang RU

Fix spelling mistake for cocoa beans in russian translation

* Fix typo in ru_ru

Fix spelling mistake for translation of Drum of the wild
2020-05-21 16:01:40 -05:00
Eutro 6a7da67f96 Add waterlogging support for Botania blocks. (#3243)
* Waterlog all the things.

* Header

* Linting and friends.

* Remove waterlogging for Manatide Bellows and Petal Apothecaries

* Blank line.
2020-05-21 16:01:18 -05:00
Determancer aa5a74c746 Update zh_cn.json (#3297)
fixed inconsistent error
2020-05-18 08:04:14 -05:00
Vasco Lavos f444119c51 Update contributors.properties 2020-05-18 11:25:47 +01:00
Hubry a0aa8a2796 Remove justified lexicon config, closes #3290 2020-05-16 00:04:46 +02:00
Hubry 905591345b Missing license header, whoops 2020-05-16 00:02:43 +02:00
Hubry baee6d2a6f Use a set of blocks for pure daisy recipe sync, closes #3289
This adds a new type of pure daisy input which matches against a set of
blocks. Clients receive the full set of blocks instead of a tag name.
Bumped the network version to account for this change.
2020-05-15 22:45:48 +02:00
Vincent Lee 1d5bf56f26 make this message time agnostic
so we don't have to keep updating it. closes #3292
2020-05-14 11:02:46 -05:00
Vasco Lavos 7cefdc25aa Update contributors.properties 2020-05-13 12:16:38 +01:00
Eutro ff360c48aa Make Magnet Lens code better but actually worse if you're a masochist. (#3241)
* Make Magnet Lens code better but actually worse if you're a masochist.

This should preserve the peculiarities of the previous logic, while fixing the unreported bug where bursts not fired from Mana Spreaders would not magnetize block around the origin.

* It's 2020 and I still can't spell "receive".

* Wow okay my bad we like fancy curly braces here.

* Fix format violations.

* Magnet lens demagnetizes if the magnetized position is invalid.

* Re-magnetize properly, fix possible edge case
2020-05-11 09:30:44 -05:00
Vincent Lee 249681dc94 Build 384 2020-05-10 18:55:02 -05:00
Vincent Lee 451a8b8e64 typo in new issue template 2020-05-10 18:50:02 -05:00
Vincent Lee 15d87f082b Delete old issue template 2020-05-10 18:49:21 -05:00
Vincent Lee 1c638c6359 Use the new issue template system github wants me to use 2020-05-10 18:48:47 -05:00
Hubry 8ebfd99157 Update mappings to 20200510 2020-05-10 21:39:43 +02:00
Hubry e3be3c6138 Fix headflowers not rendering for players in teams with name prefixes 2020-05-10 00:26:02 +02:00
Vasco Lavos 04508eb0c1 Update contributors.properties 2020-05-09 14:44:23 +01:00
Vincent Lee 7e48abfb21 Explain slot check 2020-05-07 11:31:26 -05:00
Vincent Lee c14d3b5a09 Stopgap for #3281 2020-05-07 11:29:22 -05:00
Vincent Lee 2746419151 Fix the crash in #3251, but not the underlying bug, which is more involved 2020-05-07 10:57:22 -05:00
Vincent Lee 14a78541fa Reformat 2020-05-07 10:33:55 -05:00
Vincent Lee 33ab18bef9 Only wrap shader render layers if shaders are enabled. May fix #3284. Also fix gaia head facing the wrong way in item form. 2020-05-07 10:33:26 -05:00
Vincent Lee f745a18901 Minor lexicon tweaks 2020-05-06 11:43:21 -05:00
Hubry 360553b42c Fix duplicate collision not preventing lens collisions, closes #3282 2020-05-06 15:31:35 +02:00
Vasco Lavos 49531397ed Update contributors.properties 2020-05-06 02:14:20 +01:00
Vasco Lavos a9d0c5b14e Update contributors.properties 2020-05-02 19:29:36 +01:00
Vincent Lee 3535020bbc namespace-qualify all category and template references in the lexicon 2020-04-30 11:47:38 -05:00
Vasco Lavos 2b5eacb7b8 Update contributors.properties 2020-04-30 02:12:59 +01:00
Vincent Lee 7f74381f8b Build 383 2020-04-29 16:55:38 -05:00
Vincent Lee 17f993668f Remove all remaining deps on patchouli internals 2020-04-29 16:32:43 -05:00
Partonetrain e503591a8b Fix #3232 and missing recipe in Lexica (#3268)
* pool.json Cobweb recipe

* Fix #3232

This simple fix took me longer to figure out than I'm willing to admit.
2020-04-29 14:54:52 -05:00
Hubry 1ac787807f Fix rune of winter recipe, closes #3270 2020-04-29 17:53:23 +02:00
Vincent Lee 5d26ea4486 Remove more uses of patchouli internals 2020-04-28 17:17:16 -05:00
Vasco Lavos 2fa5d6ebab Update contributors.properties 2020-04-28 17:27:28 +01:00
Hubry b22d4ddf68 Delete accidentally committed temp files
Willie says they are Krita temp files, and they misbehave on my system
2020-04-27 17:28:13 +02:00
Hubry 52c27fcc51 Allow ender air to be picked up from mid-air clicks, closes #3265
If dragon breath is found nearby, the ender air handling is skipped.
2020-04-27 17:14:09 +02:00
Vincent Lee b79be96bf0 Reformat 2020-04-26 12:38:35 -05:00
Vincent Lee 3787c789b1 Refine open/crafty crate canEject check so that it specifically checks if an item can fit where it wants to spawn it, instead of excluding anything that has a hitbox. 'Fixes' #3212 2020-04-26 12:36:46 -05:00
Vincent Lee 3d98e8121f Fix #3254. Due to how the fallback buffer works, holding onto the buffer returned by getBuffer is dangerous, because the current layer could change and the GL state not properly reset. 2020-04-26 12:13:57 -05:00
Vincent Lee bd021962cf Make botania glass blocks match vanilla glass blocks in not allowing fluid drip and not showing flowing texture. Closes #3264 2020-04-26 11:59:54 -05:00
Vasco Lavos fd363c3f7b Update contributors.properties 2020-04-24 17:26:54 +01:00
cech12 f170e319f7 apothecary more compatible with other fluid containers (#3257)
* let apothecary be more compatible with other fluid containers
- filling with lava works like filling water
- emptying apothecary with fluid containers also possible now

* fix for filled fluid containers

* second fix for filled fluid containers
- filled containers can now also be filled with fluid inside apothecary
2020-04-23 12:16:29 -05:00
cech12 bf41f5cc38 support mod shears with "forge:shears" tag & add manasteel and elementium shears to loot tables of double flowers (#3258) 2020-04-21 09:18:41 -05:00
Vasco Lavos 984e2448c8 Update contributors.properties 2020-04-21 13:35:25 +01:00
Vasco Lavos 40f5e02817 Update contributors.properties 2020-04-20 17:42:41 +01:00
Vincent Lee 18c83d6505 Bifrost blocks now color beacons 2020-04-19 19:52:07 -05:00
Vincent Lee 2c72183f77 Reduce some accesses to Patchouli internals 2020-04-19 19:31:23 -05:00
Hubry c564648a52 Fix pink wither AI tweaks not being done on world reload 2020-04-18 22:21:03 +02:00
Vasco Lavos e2a102f8dc Update contributors.properties 2020-04-17 22:08:04 +01:00
Vasco Lavos 21030105c9 Update contributors.properties 2020-04-16 11:41:31 +01:00
Hubry 66388ac52d Replace forge nbt ingredient with ours, tweak base laputa shard recipe
The problem with the Forge NBT ingredient is that it strictly matches
the stack tags. If you rename an item, or add other data, it won't work.
This replacement works with any additional tags added onto the item,
and optionally can match stacks without any data at all.
The last part is used mostly as an upgrade option for people who crafted
laputa shards and got one without NBT - new ones will gain the proper
data anyways.

Closes #3234
2020-04-15 22:59:43 +02:00
Hubry 2592415358 Fix creative mode laputa shards going too high in level 2020-04-15 22:52:48 +02:00
Hubry 43c0608063 Shaded mesa rod: fix toss on use, switch toss trigger, prevent punch dmg
Closes #3242
2020-04-15 19:53:14 +02:00
Eutro 945920a233 Fix some tooltips. (#3250)
* Restore Rainbow to Terra Shatterer tooltip.

```AbstractGui.fill``` expects an alpha value, and ```MathHelper.hsvToRGB``` does not take well to hue values above 1.

* Restore Tablet and Band tooltip colours.

* Bring forth the rank text.
2020-04-15 11:16:29 -05:00
Hubry 92a5666abf Fix incorrect corporea spark range in lexicon, closes #3249 2020-04-15 15:06:27 +02:00
Hubry aac32336e4 Save last burst collision position and only collide on the first call
Closes #3121
2020-04-15 15:05:36 +02:00
Hubry 179879bacb Add GoG-specific cocoon entry 2020-04-15 14:54:05 +02:00
Liang 05b337240b Update zh_cn.json (#3245)
* Update zh_cn.json

* readd comment
2020-04-13 22:34:29 -05:00
Vincent Lee 5378f730fe Another small cleanup 2020-04-12 23:04:47 -05:00
Vincent Lee 39fd0ed3b8 Small cleanup 2020-04-12 15:18:34 -05:00
Vasco Lavos 7ebb85ea83 Update contributors.properties 2020-04-12 20:44:54 +01:00
Vasco Lavos e1942db207 Update contributors.properties 2020-04-08 06:14:41 +01:00
Vincent Lee 1d3b388f89 Remove dash from jar file name 2020-04-07 19:37:53 -05:00
Vasco Lavos d6ebfbb5ec Update contributors.properties 2020-04-06 10:51:21 +01:00
Vincent Lee 95403d5f50 Build 382 2020-04-05 17:30:46 -05:00
Vincent Lee d356f07bf3 Reformat, write the changelog 2020-04-05 17:29:36 -05:00
Vincent Lee d87c8d4eb6 Bump patchouli again 2020-04-05 17:22:09 -05:00
Vincent Lee f91deeca58 update mods.toml versions 2020-04-05 15:55:41 -05:00
Vincent Lee 637857a84e Fix some more broken recipes 2020-04-05 15:29:28 -05:00
Vincent Lee 236d99ae60 Bump patchouli and fix a bug 2020-04-05 15:12:32 -05:00
Vincent Lee d47348209a interface-ify recipe classes 2020-04-05 14:05:09 -05:00
Hubry 44079ea64d Properly turn black to alpha in banner/shield textures 2020-04-05 19:51:42 +02:00
Vincent Lee 3ddde7141f Revert banner/shield textures 2020-04-05 12:21:53 -05:00
Vincent Lee a9dace4706 Warn on all missing recipes in patchouli components 2020-04-05 12:03:00 -05:00
Vincent Lee 72bcd9f42b Delete registerRecipeEvent 2020-04-05 11:59:33 -05:00
Vincent Lee f9e960a907 Make head recipe stateless, and use inventory-sensitive output method for all rune altar/apothecary recipes 2020-04-05 11:59:33 -05:00
Hubry dc8b74f657 Add recipe id tooltip to JEI recipes 2020-04-05 18:43:09 +02:00
Hubry 7f8429462a Fix lexicon brewing and elven trade recipes 2020-04-05 17:47:44 +02:00
Vincent Lee 101fbb2a1c Fix a field->getter i missed last commit 2020-04-05 00:53:13 -05:00
Vincent Lee 38cb6bf279 Reformat 2020-04-05 00:33:14 -05:00
Vincent Lee 2eb14c45eb Merge 1.14, and clean up some unused AT entries. 2020-04-05 00:32:21 -05:00
Vincent Lee 573a8fe9d1 Write the changelog and paste the one that somehow never got committed 2020-04-05 00:06:41 -05:00
Vincent Lee 6a6af55358 Build 2020-04-04 23:56:39 -05:00
Vincent Lee 37f60f05a5 Fix #3225 hopefully. My workspace is broken so I can't test 2020-04-04 18:46:09 -05:00
Vincent Lee 43337b723d recieve 2020-04-04 12:52:35 -05:00
Vincent Lee 0f2c8d61b6 Fix #3228 (finally) 2020-04-04 12:48:52 -05:00
Vincent Lee f8d7a2ad11 Fix mutated island being yeeted 2020-04-04 12:18:52 -05:00
Vincent Lee 97bb8c1c8f Fix doc derp 2020-04-04 12:17:13 -05:00
Vincent Lee 94ff98de27 Fix banner/shield textures, mostly 2020-04-03 19:58:12 -05:00
Vincent Lee 9b9e6fc21d Beta build 2020-04-03 19:26:40 -05:00
Vincent Lee 8df91b07cc Document apiVersion and reset it to 1 since everything changed 2020-04-03 19:22:22 -05:00
Vincent Lee 0bfbaad6ff Move cap objects out of API since they don't like being there 2020-04-03 19:19:48 -05:00
Vincent Lee 8e4666918f Migrate botaniaAPI and botaniaAPIClient to interface. Rework IMC to not rely on API. 2020-04-03 18:58:50 -05:00
Vasco Lavos ba943c8158 Update contributors.properties 2020-04-04 00:13:37 +01:00
Vincent Lee b14a964b1e More cleanups. Fix typo in CorporeaHelper classname, reformat 2020-04-03 17:08:44 -05:00
Vincent Lee 0c04fa30b1 Move ShaderCallback into mod, remove BotaniaStateProps.POWERED in favor of vanilla equivalent 2020-04-03 16:54:32 -05:00
Vincent Lee 4a63807d09 Major API cleanup for corporea. Closes #3173 2020-04-03 16:48:07 -05:00
Vincent Lee 272ef5bbab Start API cleanup: Move ManaItemHandler to an interface implemented in the mod proper. Also move ColorHelper into mod proper. 2020-04-03 15:24:22 -05:00
Vincent Lee 54cdb17809 Fix belt, cloak, terrasteel will renders 2020-04-02 13:58:33 -05:00
Vincent Lee 8984cecb89 Fix apothecary fluid render. It turns out i am not smart. Closes #3206 2020-04-02 12:56:59 -05:00
Vincent Lee 18367ee721 Fix body cosmetics 2020-03-31 21:49:47 -05:00
Vincent Lee 3c2c82b668 Fix all head cosmetics. Blue butterfly texture changed so axis of rotation is down the middle of the texture bc that makes the GL easier :V 2020-03-31 20:55:18 -05:00
Hubry 3a8170ded0 Don't enforce formatting checks for building, should fix maven builds? 2020-03-31 17:00:33 +02:00
Hubry 74b358f127 Hide the elven return recipes again, unhide and fix lexicon trade recipe 2020-03-31 15:07:23 +02:00
Vincent Lee ef796e5311 Remove allocation-heavy method in alfportal 2020-03-30 23:25:40 -05:00
Vincent Lee 6c99e4e19a Reformat 2020-03-30 23:08:22 -05:00
Vincent Lee c9cc1c615a Gog orechid recipe, yeet kanade config 2020-03-30 23:08:05 -05:00
Vincent Lee 55c67c799f Fix lexicon, other bugs 2020-03-30 22:33:09 -05:00
Vincent Lee af9b77e0ea Fix more bugs, rename petal and rune recipe folders 2020-03-30 22:10:10 -05:00
Vincent Lee 5d04baf7d7 Fix missing write in petal serializer 2020-03-30 21:56:34 -05:00
Vincent Lee e0951a851c Rune recipes to json 2020-03-30 21:55:28 -05:00
Vincent Lee 748ef78b3a Petal recipes to json 2020-03-30 21:24:07 -05:00
Vincent Lee f8c80d519e Organize datagenerators a bit 2020-03-30 17:26:54 -05:00
Vincent Lee 604e0f5d99 Brew recipes to json 2020-03-30 17:24:11 -05:00
Vincent Lee 12129ea470 Move brews to a forge registry (about time) 2020-03-30 16:42:04 -05:00
Vincent Lee 9af5cdbd2d Cleanups, remove IBotaniaBoss (did anyone ever use this?) 2020-03-30 15:50:27 -05:00
Vincent Lee 4616924dae Fix formatting 2020-03-29 19:56:41 -05:00
Vincent Lee e61b4b2b9c Fix some rendertypes, preallocate the pool water buffer to fix #3210 2020-03-29 19:47:51 -05:00
Vincent Lee d4734e3fe6 Move inventory cases of itemfinder to last, fixes villager trades not being shown. Allow wandering trader to be scanned as well. 2020-03-29 13:26:40 -05:00
Vincent Lee c7585c3c2c Fix a ton of accessory renders. Remaining: tiaras, cloaks, belts, cosmetics 2020-03-29 13:10:15 -05:00
Vincent Lee d0f9f108c0 Fix cosmeticable items never rendering if no cosmetic 2020-03-29 11:49:28 -05:00
Vincent Lee 52d47de619 Use our own render path for curios so the layer can be passed in 2020-03-29 11:17:10 -05:00
Vincent Lee 7b979c430e Beta build 2020-03-29 11:15:15 -05:00
Vasco Lavos 90b5f32a60 Update contributors.properties 2020-03-29 06:59:33 +01:00
Vincent Lee 09b18e8ab9 Allow json states to be plain strings, fix up error handling and gog build 2020-03-28 20:42:19 -05:00
Vasco Lavos c412c671f9 Update contributors.properties 2020-03-28 18:56:57 +00:00
Vincent Lee e0f272a358 Fix mana tablet render, again hopefully for good 2020-03-28 13:35:00 -05:00
Vincent Lee f675d2ff80 Fix contributor renders, hopefully for good 2020-03-28 13:35:00 -05:00
Vasco Lavos 02c3c82cf3 Update contributors.properties 2020-03-28 10:48:15 +00:00
Vasco Lavos 5c22d60477 Update contributors.properties 2020-03-26 17:31:24 +00:00
Hubry 15d0a8a219 Move pure daisy to json, clean up block input handling slightly
Change input format for mana infusion catalysts
Shorten JEI pure daisy windows a bit to fit more at once
2020-03-26 12:56:51 +01:00
Vincent Lee e7d1bc2b4b Don't generate 'count' into json if it's 1 2020-03-25 15:57:53 -05:00
Vincent Lee f88b101b6b Move GoG mana infusion recipes to the gog datapack 2020-03-25 15:52:23 -05:00
Vincent Lee 890034ec56 Increment r-version to match minecraft version, beta build 2020-03-25 15:32:57 -05:00
Vincent Lee 53facd1f5f Fix formatting 2020-03-25 15:31:44 -05:00
Vincent Lee 7ff539c5cd Move mana infusion to json 2020-03-25 15:25:50 -05:00
Hubry 64bd4cb390 Fix bergamute wrapped sounds being discarded as silent, closes #3218 2020-03-25 20:23:35 +01:00
Vincent Lee 80dc95684e getInputs is redundant with getIngredients 2020-03-25 13:53:43 -05:00
Vincent Lee ff1d8ca293 Move lexicon elven trade recipe as well 2020-03-25 13:47:42 -05:00
Vincent Lee ccd2d01bb7 Bump patchouli 2020-03-24 21:33:41 -05:00
Vincent Lee 188cf3f5a0 Experimental: Move elven trade recipes to vanilla json system 2020-03-24 21:19:16 -05:00
Vasco Lavos 1a0c730b4f Update contributors.properties 2020-03-23 01:20:21 +00:00
Vincent Lee df3f177180 Vanilla block/cross doesn't set correct parent, do so. Fixes #3214 2020-03-22 20:07:54 -05:00
Vincent Lee 68048891d7 Fix cocoon render being offset, change pixie spawn chance attribute registration location again. 2020-03-22 19:59:06 -05:00
Vasco Lavos 527e3b07fd Update contributors.properties 2020-03-21 20:24:33 +00:00
Vasco Lavos e0cc95c521 Update contributors.properties 2020-03-21 17:31:35 +00:00
Vasco Lavos d67e884b69 Update contributors.properties 2020-03-21 16:38:30 +00:00
Vincent Lee 24b6f06a80 Fix a bunch of waterlogging edge cases. Closes #3188 2020-03-19 21:25:17 -05:00
Vincent Lee 9d99c7184f Account for nullable placer in onBlockPlacedBy. Closes #3215 2020-03-19 21:04:36 -05:00
Vincent Lee 2399745ff1 Fix formatting 2020-03-19 11:28:59 -05:00
Vincent Lee 123b750d24 Loonium no longer runs or consumes mana in peaceful mode 2020-03-17 14:55:43 -05:00
Vincent Lee 9fa67371f0 Tall mystical flowers require vanilla shears again 2020-03-17 14:54:48 -05:00
Vincent Lee 315a4c3a02 Fix loonium crash and also allow drowned to be spawned. 2020-03-17 13:32:55 -05:00
Vincent Lee 160b0c9887 Bump forge, fix #3123 with global loot modifier 2020-03-16 21:40:35 -05:00
Vincent Lee f1ce9a2e7b Fix blood pendant render crashing. Closes #3213 2020-03-16 20:30:56 -05:00
Vasco Lavos ad7666e668 Update contributors.properties 2020-03-15 21:46:17 +00:00
Hubry cacb5121b3 Cocoons can now be forced to spawn rare mobs with gaia spirits
Tweaks to cocoon emerald particles to reduce overlap
2020-03-14 12:50:34 +01:00
Vincent Lee 9fb509eab9 Merge branch 'master' of github.com:Vazkii/Botania into 1.15 2020-03-13 17:10:47 -05:00
Vincent Lee d14fba628b This never got incremented last release :wacko: 2020-03-13 17:09:23 -05:00
Vincent Lee 9e50843ee4 Fix #3208 2020-03-13 17:07:03 -05:00
Vincent Lee a2f8de9075 Merge 1.14 2020-03-13 17:03:33 -05:00
Vincent Lee ae6679d06f Right click to update mana is gone :crabrave: 2020-03-13 16:33:02 -05:00
Vasco Lavos 86bb0df996 Update contributors.properties 2020-03-13 15:40:53 +00:00
Vincent Lee 888b3235ea Only generate mana from items on server side. Might fix #3195 2020-03-12 20:11:38 -05:00
Vincent Lee ed1005b57b Fix ghost rail crashing when landing on a ghost rail then running onto a mundane rail 2020-03-12 20:08:48 -05:00
Vincent Lee dca245bfac Fix flower map being thread unsafe 2020-03-12 19:04:08 -05:00
Vincent Lee 54c147c982 Fix flower models being broken 2020-03-12 11:33:31 -05:00
Hubry d1f54d0964 Switch line endings to lf
I am not smart. And I was a bit in a rush last time.
2020-03-11 11:41:41 +01:00
Hubry 2066bc61a9 Normalize java line endings on crlf
This should fix the build?
2020-03-11 02:13:03 +01:00
Hubry 11ea832cbe Bump Curios, handle curio drop event for ivy, drop items that don't fit 2020-03-11 01:19:59 +01:00
Vasco Lavos 058b03660f Update contributors.properties 2020-03-10 12:08:13 +00:00
Hubry ef982f1e9e Fix mana clip attaching destroying lenses after recipe preview 2020-03-09 18:51:16 +01:00
Vasco Lavos f49e3bdb37 Update contributors.properties 2020-03-09 10:30:09 +00:00
Hubry 6d7e5037d9 Update contributing info, add PMD/Spotless to github actions builds 2020-03-07 23:07:41 +01:00
Hubry 2152473edb Run Spotless, cleanup unused imports, add braces to one line for/if/etc. 2020-03-07 22:39:15 +01:00
Hubry 21d9d95611 Set up Spotless and PMD for some basic formatting 2020-03-07 22:38:28 +01:00
Al Winfy a534f041f5 Move spreader magic-numbers into the enum (#3200) 2020-03-07 12:38:36 -06:00
Vasco Lavos 5a6fc49079 Update contributors.properties 2020-03-06 18:17:18 +00:00
Vasco Lavos 807c7174ed Update contributors.properties 2020-03-05 17:43:43 +00:00
Vincent Lee f91dd3873f Merge 1.14 2020-03-03 10:34:38 -06:00
Al Winfy 0cc7ab725e Remove extraneous keys, add N*merical Mana entry in web-lexicon (#3191) 2020-03-02 21:36:26 -06:00
Vincent Lee d3959c1d25 Fix pixie attribute registration again 2020-03-02 18:11:03 -06:00
Vincent Lee c40d4aa3ee Migrate halo render fully to renderlayers but it still flickers 2020-03-02 16:16:21 -06:00
Vincent Lee ea5265a4e5 Fix an entropinnyum oversight 2020-03-02 11:19:51 -06:00
Vincent Lee 7b2b8a69b0 Run keepivy handler later so it receives curio drops as well. Closes #3196 2020-03-01 22:33:08 -06:00
Vasco Lavos 99da7678d9 Update contributors.properties 2020-03-01 19:50:21 +00:00
Vasco Lavos 5ee1f12082 Update contributors.properties 2020-02-29 16:24:00 +00:00
Hubry 06453e84e6 Re-add missing floating endoflame recipe, closes #3192
This one is not my fault! It was gone before I did the recipe generator.
2020-02-29 00:11:05 +01:00
Hubry 4b8be63622 Fix bifrost pane properties, closes #3189 2020-02-28 12:05:35 +01:00
Vasco Lavos 60f2727e15 Update contributors.properties 2020-02-27 17:22:55 +00:00
Hubry d3dfa2763c Fix recipe mistake missed when checking the generated recipe diff 2020-02-27 15:29:05 +01:00
Vincent Lee 1a303f8bd6 bump curios, dep-specs 2020-02-26 19:43:11 -06:00
Vincent Lee c14aa26929 Move exchange rod back to matching blocks instead of states 2020-02-26 19:30:05 -06:00
Vincent Lee a19231b451 More api 2020-02-26 19:19:12 -06:00
Vincent Lee 926b8d864a More API cleanup (notably, remove TileSignature) 2020-02-26 19:10:50 -06:00
Vincent Lee 8d54c9a8cb Start API cleanup 2020-02-26 18:49:24 -06:00
Vincent Lee 76fa4cba29 Bound tile renderer renders all parts of a complex voxelshape instead of just the border 2020-02-26 18:35:33 -06:00
Vincent Lee f688cd57de Fix babylon weapons not rendering, but the transforms are still off 2020-02-26 14:15:01 -06:00
Vincent Lee 0e0233a5a6 Fix index render 2020-02-26 13:43:41 -06:00
Vincent Lee dfa9e66efc Cleanups in ModBlocks 2020-02-26 10:55:38 -06:00
Vasco Lavos db3d72c726 Update contributors.properties 2020-02-26 16:52:49 +00:00
Vincent Lee d70f7e2754 Query spreader render layer from the blockstate 2020-02-26 10:42:48 -06:00
Vincent Lee 5109fb06d0 Clean up isXSpreader methods on tilespreader 2020-02-26 10:40:11 -06:00
Vincent Lee 049936bc30 Complete migration of spreaders to baked models 2020-02-26 10:27:53 -06:00
Vincent Lee fcb301a97f Rename spreader textures 2020-02-26 09:59:52 -06:00
Vincent Lee 944410603c WIP: Begin transitioning mana spreader to use baked models 2020-02-26 00:37:14 -06:00
Vincent Lee 7c9782a5c9 Fix typo in layer name 2020-02-25 21:18:16 -06:00
Vincent Lee ab8713d521 Clean up RenderHelper blit method 2020-02-25 21:17:29 -06:00
Vincent Lee 3de6b06679 Disable quad sorting on our GL_TRIANGLES renders, also fix culling not being disabled 2020-02-25 20:48:49 -06:00
Eutro 114a684578 Don't reduce stack size when re-adding previous recipe in creative. (#3187)
* Don't reduce stack size when re-adding previous recipe in creative.

* Don't require any items at all if in creative.
2020-02-25 15:34:34 -06:00
Eutro 6f02a65c60 Dispenser Wand Functionality for Sneak-Right Clicking. (#3165)
* Update TilePool.java

* Break Force Relay with dispenser.

Why not?

* Hopperhock cycle filter type with dispenser.

This could lead to new functionality and could certainly not break anything.

* Reverse or change turntable speed with wand.

Reverse if in function mode, or cycle speed if in bind mode.

* Look who missed a parenthesis.

* Fix crash.

* Lexicon Additions

Since these actions normally require sneaking, it may be ambiguous whether a dispenser can perform it.

* Fix typo in Spreader Turntable entry.

* Side distinction rather than mode distinction for turntable.
2020-02-25 12:42:32 -06:00
Hubry d365273ead Fix fabulous pool item render, move TE render color calc from awt 2020-02-25 00:17:12 +01:00
Vincent Lee c65062dd53 Delete unneeded cross_tinted now that special flower coloring is gone 2020-02-24 14:53:36 -06:00
Hubry cc73e72fbc Dyeing fabulous pools now multiplies the color instead of ignoring dye 2020-02-24 20:24:19 +01:00
Hubry a9496b98ae RIP remains of dyeing special flowers, feature no one heard of 2020-02-24 19:46:57 +01:00
Hubry 76f116dc90 Check if models were registered to avoid misleading NPE crashes
This happens if an error occurs earlier, causing Forge to start aborting
 loading. Not all things are stopped and not all exceptions are caught
 gracefully, and if something throws one that crashes the game, a crash
 report will be generated instead of an error screen appearing.
2020-02-24 19:32:57 +01:00
Hubry 4bb46ef9ec Make all tints index checked 2020-02-24 19:30:45 +01:00
Al Winfy 79ccf912ff Update bottle textures to 1.14+ (#3186) 2020-02-23 23:00:41 -06:00
Tiago Carvalho 380a57d1d5 hotfix to allow force relays to store their bound blocks on other dimensions (#3182) 2020-02-23 21:58:59 -06:00
Al Winfy a70c3ad12e Clean up typos, update info in en_us Lexica (#3185) 2020-02-23 21:50:17 -06:00
Hubry 2a0f8d42d3 Fix banner pattern lang on other languages 2020-02-23 00:58:37 +01:00
Vincent Lee 6d95ea4375 Remove noloc entry as it's unused 2020-02-22 15:05:12 -06:00
Vincent Lee 263b74faf6 Name for new loki advancement 2020-02-22 15:02:59 -06:00
Vincent Lee e49f51a3e1 Fix at least one known instance of #3140 2020-02-22 10:12:34 -06:00
Vincent Lee a35da8e163 Switch a bunch of world.getblockstate calls in te's to self getblockstate 2020-02-22 09:29:07 -06:00
Vincent Lee 30472c4d80 Merge 1.14 2020-02-20 23:00:21 -06:00
Vincent Lee 612d8f886e Migrate piston relay to proper per-world WSD 2020-02-20 22:59:12 -06:00
Vincent Lee fe0bf9407b Fix pixie handler crashing when entering alternate dims 2020-02-20 22:58:58 -06:00
Vincent Lee 4079187457 Check force relay direction using the block 36 TE, closes #3181 2020-02-20 22:35:19 -06:00
Vincent Lee 8e99f81335 Fix a lot of animations jittering when the game is paused. Closes #3038 2020-02-20 22:07:37 -06:00
Vincent Lee 0ac2062431 Fix bound block renders being faint and not depth ignoring 2020-02-20 21:44:33 -06:00
Vincent Lee 1a4b5ed286 Fix compile and rerun data 2020-02-20 21:03:28 -06:00
Vincent Lee a6cf5653dc Merge 1.14 2020-02-20 21:00:55 -06:00
Vincent Lee 1e280976c4 Some color fixes 2020-02-20 21:00:12 -06:00
Vincent Lee c0eed8a8e9 Remove unneeded override as it's covered by the one above it now 2020-02-20 14:10:50 -06:00
Vincent Lee 0440ada3dd More lang file cleaning 2020-02-20 11:36:16 -06:00
Vincent Lee 52abb968e4 Clean out some dead lang entries 2020-02-20 11:23:05 -06:00
Vincent Lee 3e77b0bee0 Fix non-english advancement names being...broken...since...1.12... 2020-02-20 00:45:55 -06:00
Vincent Lee 6346da980e Advancement: That's Why I Baked Bread
Context: Issue 2403, and https://www.nicovideo.jp/watch/sm33746095
2020-02-20 00:13:12 -06:00
Vincent Lee b3ac525569 Loki ring advancement, no title yet 2020-02-19 23:39:31 -06:00
Vincent Lee 42193cc127 Azulejo creation now takes any blue dye 2020-02-18 19:40:07 -06:00
Hubry 337f9fe322 Add workaround crafting recipe for Botania banner patterns, rerun data
Closes #3114
I was planning to do this for a while, and accidentally added the empty
class for the recipe with the recipe generator...
2020-02-18 17:57:33 +01:00
Hubry 99df65bb45 Change the seed source for plentiful mantle rod, fixes #3178 2020-02-17 19:10:31 +01:00
Hubry 0e73ef6f08 Minor patchouli corrections, remove old TC recipes/integration pages 2020-02-17 18:40:25 +01:00
Hubry 6fe73cb39f Generate recipe and advancement jsons, remove old recipes
Closes #3171
2020-02-17 18:38:22 +01:00
Hubry 9cc6eb9870 Create recipe generator for existing json recipes 2020-02-17 18:34:20 +01:00
Vincent Lee c19c4ecbb3 Generate floating flower item models and fix their in-hand transforms 2020-02-17 11:05:34 -06:00
Vincent Lee df11e72db3 Fix compile error, make ColorHelper less awful 2020-02-16 21:45:18 -06:00
Vincent Lee e5c5a37f27 Merge 1.14 2020-02-16 21:26:51 -06:00
Vincent Lee 59e0c6c987 Narrator: it wasn't released 2020-02-16 21:21:36 -06:00
Vincent Lee 9253a541c4 Replace bauble box slots with a player render because what else would i put there 2020-02-16 21:20:23 -06:00
Vasco Lavos eabdbd910a Update contributors.properties 2020-02-16 14:16:03 +00:00
Vincent Lee 3ccbef5c16 Loki ring now highlights center pos in bold even when not building a new list of cursors 2020-02-15 19:58:32 -06:00
Vincent Lee 162519dba3 Fix loki ring being bork, should now match 1.7 behavior exactly. Closes #3179 2020-02-15 19:58:32 -06:00
Vincent Lee 13668c5448 Modernize ToolCommon.raytraceFromEntity 2020-02-15 19:58:31 -06:00
Vincent Lee dde52533fd Corporea feedback for stack requests now uses the fancy component with hoverevent 2020-02-15 01:15:46 -06:00
Vincent Lee f4886b8627 new Style.setColor -> applyTextStyle 2020-02-15 01:15:06 -06:00
Vincent Lee d434a1c915 Eliminate awful logic duplication in ManaItemHandler 2020-02-15 01:12:11 -06:00
Vincent Lee 918372c404 Convert Pixie Spawn Chance into an attribute 2020-02-15 00:39:25 -06:00
Vincent Lee 622fd8a3f6 Remove old lexicon method 2020-02-14 23:59:33 -06:00
Vincent Lee 477e350757 Remove legacy meta method 2020-02-14 23:54:25 -06:00
Vincent Lee 669568f426 Move inner helper method of manaprof armor to the interface itself 2020-02-14 23:53:38 -06:00
Vincent Lee 92c6708a68 Replace sortable tool tooltypes with the ones that have been in forge for... a while 2020-02-14 23:50:45 -06:00
Vincent Lee 0a558f72bd Some cleanups 2020-02-14 22:52:38 -06:00
Vincent Lee 85a7c986cf Restore lexicon first person render, mostly 2020-02-14 22:48:53 -06:00
Vincent Lee 05fe2c195c Bump patchouli and forge, fix floating flower in world render 2020-02-14 20:56:28 -06:00
Vincent Lee 9c23ff9257 Use forge's getHighlightTip for wand instead of rendering mode line ourselves 2020-02-14 20:24:02 -06:00
Vasco Lavos 954020392f Update contributors.properties 2020-02-14 17:00:09 +00:00
Vasco Lavos b373df600c Update contributors.properties 2020-02-13 22:56:55 +00:00
Vasco Lavos 674c454030 Update contributors.properties 2020-02-11 17:29:09 +00:00
Vincent Lee 065d189c5e Mark cocoon-spawned entities as un-despawnable 2020-02-10 13:17:05 -06:00
Vincent Lee bb68017141 Fix missing nullcheck in platform. Closes #3168 2020-02-07 21:10:43 -06:00
Vincent Lee 647e122418 Fix unnecessary cast in CompositeLensRecipe 2020-02-07 13:55:04 -06:00
Vincent Lee d46c35df14 Clean up agricarnation code a bit, fix it not speeding up berries and bamboo 2020-02-07 10:56:26 -06:00
Vasco Lavos fbddf4862b Update contributors.properties 2020-02-07 10:12:39 +00:00
Vasco Lavos ef4ede8906 Update contributors.properties 2020-02-06 21:30:27 +00:00
Hubry 7a05395ba3 Add a decay indicator on stacks of hydroangeas 2020-02-06 19:00:53 +01:00
Hubry bbb472c3a8 Fix exoflames trying to smelt unsmeltables after a smeltable was put in 2020-02-06 18:51:32 +01:00
Hubry e96550208b Fix spawner spawned slimes working for narslimmus 2020-02-06 01:25:47 +01:00
Vasco Lavos e2f0220dd4 Update contributors.properties 2020-02-05 09:50:01 +00:00
Vincent Lee 4185fac8d6 Build 2020-02-04 17:42:25 -06:00
Hubry d49fba9abc Fix redirect lens pointing at 0,0,0, closes #3167 2020-02-05 00:38:24 +01:00
Vincent Lee 607c581970 Bump Patchouli 2020-02-04 17:32:19 -06:00
Vincent Lee 9006e7c795 Fix #3161 flight bar drained by creative/spectator 2020-02-04 16:59:04 -06:00
Hubry 10ac3c3067 Fix empty prisms allowing warped bursts to transfer mana 2020-02-02 22:51:29 +01:00
Vincent Lee 31de0d6dd1 Merge branch 'master' of github.com:Vazkii/Botania into 1.15 2020-01-31 13:14:42 -06:00
Vincent Lee 04ebd8c077 Github CI: Build with --no-daemon 2020-01-31 13:10:23 -06:00
Vincent Lee ca8f61b8b1 Get rid of all 1.7-era 'parN' style parameter names 2020-01-31 13:08:16 -06:00
Vincent Lee ef79dc7507 Remove useless passing of 1|2 to setblockstate 2020-01-31 12:59:33 -06:00
Vincent Lee d68f34fcfe Fix red string blocks being placed backwards 2020-01-31 12:49:55 -06:00
Vincent Lee 4ea449d723 Revert vinculotus map back into a set, hack no longer needed thanks to getEffectivePos 2020-01-31 12:48:27 -06:00
Vincent Lee 144f023041 Clean up some reflection 2020-01-31 12:30:26 -06:00
Vincent Lee ea4ecf92af Remove blurmipmap hack 2020-01-31 12:08:04 -06:00
Vincent Lee 9d7e8b5c2f Update to 1.15.2 2020-01-31 12:06:11 -06:00
Hubry 4f5adbe992 Fix dispensers checking valid cocoa directions on own pos, closes #3159 2020-01-30 19:50:05 +01:00
Hubry 12e67ab394 Replace 256 wand of the forest recipe jsons with one custom recipe type
Prevents flooding JEI with tons of irrelevant recipes, and recipe book
buttons going offscreen if you look at all the variants of the wand.
Side effect is not showing the colored wands in JEI/Patchouli, but
that's fine.
2020-01-30 19:02:41 +01:00
Hubry 7cbe19271c Fix terra blade bursts ignoring players you can damage
I had this one check wrong
2020-01-30 19:02:40 +01:00
ToMe25 ac609c9e82 Fix the "bleeding-edge lang file" link (#3163)
Fix the website lexicon page "bleeding-edge lang file" link to the github lang file, as it still linkes to a not existing en_US.lang one.
2020-01-30 10:12:08 -06:00
ToMe25 41d3c62eb9 Add a Recipe for Sweet Berries (#3160)
* Add a Recipe for Sweet Berries

* Add back the unused import

to prevent merging issues.
also how did this lang change sneak in here?

* rename translation to manaAlchemy28

as its no longer used by #3157

* Merge branch 'master' into ToMe25-patch-16

* Revert "Merge branch 'master' into ToMe25-patch-16" (#5)

This reverts commit 5d9c68d4bbf30261ef2f0f708e0dd21b273f912b.
2020-01-30 10:11:43 -06:00
Vincent Lee d66058f661 Merge 1.14 2020-01-29 13:36:27 -06:00
Vincent Lee c280e31171 Delete web-legacy, again can be found in repo history if needed 2020-01-27 23:34:50 -06:00
Vincent Lee 0a24c0f8f6 Delete alt_resources as they are no longer supported in 1.14+, they can be found in older branches for older versions. 2020-01-27 23:30:26 -06:00
Vincent Lee 5ab7acd37a Move settings that should trigger recache into build.gradle itself, enable caching 2020-01-27 23:22:46 -06:00
Vincent Lee 8f3d5fae48 Let's try this again: Revert "Disable autobuild until I figure out what's going on"
This reverts commit 60fac23652.
2020-01-27 23:04:35 -06:00
Vincent Lee 0175d2c4fc Bump patchouli dep, fix trailing comma in gog entry, and add landing text based on the website blurb 2020-01-27 23:03:52 -06:00
Vincent Lee faeaf7285b Return of the meme 2020-01-27 22:50:26 -06:00
ToMe25 622bbeb9fe Allow the Terrestrial Agglomeration Plane to use Shimmerrock (#3158)
* Allow the Terrestrial Agglomeration Plane to use Shimmerrock

* how did this get here?

* why didn't this get uploaded?

* change Terrestrial Agglomeration Plane livingrock tag to terra_plate_base

* Remove unneeded item tag
2020-01-27 11:36:21 -06:00
ToMe25 ea30c6aa4a Add a recipe for the Haert of the Sea (#3157)
* Add a recipe for the Haert of the Sea

Add the infused nautilus shell as a crafting item for the heart of the sea

* change the recipe for the Heart of the See to use

a Mana Pearl instead of one of the Manasteel ingots

* Remove the Infused Nautilus Shell and added an Alchemy Recipe for the Heart of the Sea.

* Change the mana cost for the heart of the sea to 20k

as blazepowder to mana suggested

* Make heart of the sea recipe gog only

* fix the lexicon entries getting in the wrong directory
2020-01-27 11:36:00 -06:00
Vasco Lavos 1c4f98d2bc Update contributors.properties 2020-01-24 17:03:03 +00:00
Vincent Lee 6a46558652 Eliminate uses of java.awt.Color since using awt with lwjgl3 is apparently bad now 2020-01-23 22:32:42 -06:00
Vasco Lavos 4abd565936 Update contributors.properties 2020-01-23 18:10:26 +00:00
Vincent Lee 289dd6f9a8 Same for damage lens 2020-01-23 10:28:45 -06:00
Vincent Lee 947b591c9c Player-fired entropic bursts now count as player kills 2020-01-23 10:14:51 -06:00
Vincent Lee ea0201ec0e Remove botania's lang entries for vanilla colors as vanilla has them now 2020-01-23 10:04:37 -06:00
Vincent Lee 0d094a8bf6 Delay burst instantiation until we're sure we have enough mana. Closes #3133 2020-01-22 19:14:33 -06:00
Vincent Lee 830b87db40 Save and restore full state when mossifying an altar, fixes #3154 2020-01-22 19:11:50 -06:00
Vincent Lee 3b250ae1c2 Make desu gun use handheld model, fixes #3153 2020-01-22 19:09:23 -06:00
Vincent Lee f0718de536 Make dedicated mana blaster advancement trigger and desu option. Consistentifies desu gun advancement criteria with the desu gun appearance. Closes #3156 2020-01-22 18:57:54 -06:00
Vincent Lee a12056fbf4 Remove custom getLightValue from subtiles, should be implemented on a per-block basis now the usual vanilla way. May resolve lighting issues? (#3140) 2020-01-22 18:18:31 -06:00
Vincent Lee 42ee5d0d8d Merge 1.14 2020-01-22 17:05:28 -06:00
Vincent Lee af0217153d Fix cell blocks not respecting getEffectivePos 2020-01-22 10:12:49 -06:00
Vasco Lavos 07916b13ed Update contributors.properties 2020-01-22 15:41:34 +00:00
Vincent Lee a6ad70f0bc Fix red string renderer freaking because alpha is less than 0 2020-01-21 21:48:14 -06:00
Vincent Lee 1954b69e16 Fix tiny potato aux renders 2020-01-21 21:38:48 -06:00
Vincent Lee 549adb3d42 Fix gold renders 2020-01-21 11:45:25 -06:00
Vincent Lee de450cb633 Fix astrolabe shader usage and preview being offset in Z direction 2020-01-21 10:42:15 -06:00
Vincent Lee e78a1f21f3 update accessoryhelper to use matrixstack 2020-01-21 10:21:43 -06:00
Vincent Lee edf40208bf Some spring cleaning 2020-01-19 18:10:48 -06:00
Vincent Lee d00f0e14e8 build 2020-01-19 18:01:23 -06:00
Vincent Lee b7e8c665b6 Fix a bunch of legacy format codes in non english lexicon entries 2020-01-19 17:56:23 -06:00
Al Winfy 0fd1b5fb9c Remove Tiara's dependence on fallDistance (#3143)
Effectively allows it to work with skyrod
2020-01-19 17:16:20 -06:00
ToMe25 463eafb860 Make Ring of Dexterous Motion able to be used in.. (#3104)
..all four directions and while moving
2020-01-19 17:11:36 -06:00
Vincent Lee 60fac23652 Disable autobuild until I figure out what's going on 2020-01-19 16:57:39 -06:00
Vincent Lee b94a6a6101 Extra ore weight patch 2020-01-19 16:42:10 -06:00
Vincent Lee da99dc8247 Add build action for pushes and PR's 2020-01-19 16:37:24 -06:00
ToMe25 ddcb1036b3 Add some Orechid compatibility back (#3113)
* Add some Orechid compatibility back

There are some of the old OreDicts left as i didn't knew how to update them, but they can remain commented out for now.

* Delete IMCSender.java

Another upload that didn't understand it should go in the opened directory, maybe i should stop using the web interface...

* Add some Orechid compatibility back

There are some of the old OreDicts left as i didn't knew how to update them, but they can remain commented out for now.

* Remove all the ores that aren't even 1.12.2

* Update some ore weights

* Update some more Ore Weights

* Fix some small things
2020-01-19 16:32:22 -06:00
Vincent Lee bbc3892761 Orechid now filters out empty tags before trying to pick one. Fixes situations where many registered tags being empty would 'starve' out the nonempty ones 2020-01-19 16:30:44 -06:00
Vincent Lee 0e73e16e10 Fix vine and mushroom rendering 2020-01-19 16:21:42 -06:00
Vincent Lee 2577de5b60 Fix sparks not rendering and solid vines not being flammable (patches from MoriyaShiine) 2020-01-19 16:04:51 -06:00
Vincent Lee 0836cee840 Fix enchanter and terra plate renders 2020-01-19 12:06:56 -06:00
Hubry b9c1ae85bf Fix shaded mesa not launching entities, closes #3106
Also stops the expiry countdown from incrementing past -1
2020-01-19 19:02:11 +01:00
Hubry f7da8b4109 Don't draw tiara/dodge hud if hud is hidden by creative
Didn't check creative when changing this earlier
2020-01-19 18:09:34 +01:00
Hubry 09f4864738 Replace the duplicated livingrock recipe with the somehow removed cobble 2020-01-19 17:34:31 +01:00
Hubry 81391688ae Move tiara/dodge renders, use forge's gui offsetting for flight bar
Fixes #3118
2020-01-19 17:33:04 +01:00
Hubry 8fa3d9c790 Fix config typo that went unnoticed for over 5 years :wacko: 2020-01-19 00:40:20 +01:00
Hubry d5b91eefb4 Attempt at fixing #3108
Stopping sprint doesn't do much if you are holding ctrl anyways
Closes #3108
2020-01-19 00:39:22 +01:00
Hubry 3090006d5e Move fish to spawn if the cocoon is next to water, add other water mobs 2020-01-18 23:32:59 +01:00
Vincent Lee 4691f7d4a1 Fix mana blaster lens render 2020-01-18 16:09:19 -06:00
Vincent Lee 8e9f5a1473 Fix some of tiny potato renders 2020-01-18 15:28:01 -06:00
Vincent Lee 8d0c8e13c4 Also delete ItemBlockMod 2020-01-18 15:11:29 -06:00
Hubry 0840478c2a Replace PvP-enabled check with "can player damage other player" check
Fixes #3146
2020-01-18 22:08:51 +01:00
Vincent Lee 09352e7285 Snipe some todos, delete ItemMod class 2020-01-18 14:56:20 -06:00
Hubry 11ea2ed845 Simple fix for invisible chakrams, fixes #3149 2020-01-18 18:47:04 +01:00
Vincent Lee a6dd4d74fa Fix floating flower transforms 2020-01-17 22:52:29 -06:00
Vincent Lee c509874908 Datagenerate floating flower blockstates and models 2020-01-17 22:30:24 -06:00
Vincent Lee 784844914a Datagenerate red string blockstates 2020-01-17 21:34:24 -06:00
Vincent Lee d75df9fa6a Datagenerate incense plate, pump, fel pumpkin, tiny potato 2020-01-17 21:24:00 -06:00
Vincent Lee f58a48c254 Datagenerate special, mystical, glimmering, tall flower and mushroom blockstates 2020-01-17 19:49:36 -06:00
Vincent Lee 505e9fa1bf Apothecaries data generated 2020-01-17 19:22:22 -06:00
Vincent Lee e5bd8548f4 Panes and walls, move stairs out of their folder 2020-01-17 19:20:48 -06:00
Vincent Lee 73685b3e8e Generate fences and fence gates blockstates 2020-01-17 18:17:02 -06:00
Vincent Lee e535b05ad0 Generate more stuff (metamorphic, quartz, slabs, stairs 2020-01-17 18:09:10 -06:00
Vincent Lee 01e80c0f54 Generate stair blockstates, also fix avatar tesr stack underflow 2020-01-17 17:36:40 -06:00
Vincent Lee 3f43b02686 Fix missing random rotations for altgrasses 2020-01-17 17:07:01 -06:00
Vincent Lee 3d0fd19d1e Commit generated simple blockstates 2020-01-17 17:01:07 -06:00
Vincent Lee 0293e319e3 Generate blockstate jsons for simple blocks (code side). generated jsons coming after verification 2020-01-17 16:19:56 -06:00
Vincent Lee fae570c51f Bump forge and mappings 2020-01-16 22:50:47 -06:00
Vincent Lee c6403411d9 Remove mcmetas that aren't respected by the atlas anyways 2020-01-16 16:07:12 -06:00
Vincent Lee 0885a5d9d8 Fix sparkle particles with the same workaround 2020-01-16 16:01:48 -06:00
Vincent Lee 596f753c9f Add a temporary workaround for the forge issue 2020-01-16 15:45:44 -06:00
Vincent Lee f4821c8e17 Convert wisp particles to vanilla system, needs forge fix to fully work 2020-01-16 15:09:53 -06:00
Vincent Lee aa04783e3e Fix missing entity renderers, shader layers for pylons 2020-01-16 11:32:58 -06:00
Vincent Lee 6676f370fd Fix more bugs 2020-01-16 00:32:38 -06:00
Vincent Lee a8d2139d61 First pass of crash and bug fixes. Runs surprisingly well 2020-01-15 23:09:54 -06:00
Vincent Lee fa325cefdf Fix crashes 2020-01-15 21:33:09 -06:00
Vincent Lee 76bdd37efe Rendersystem substitutions 2020-01-15 20:57:25 -06:00
Vincent Lee af297af299 Compiling 2020-01-15 20:29:54 -06:00
Vincent Lee cf54cc2b13 More work, fix gaia head tesrFix gaia head tesr 2020-01-15 15:58:23 -06:00
Vincent Lee ebee563201 on the home stretch to compiling 2020-01-14 22:57:11 -06:00
Vincent Lee 0d1c3fda37 starfield, partial tiny potato workpartial tiny potato work 2020-01-14 21:41:29 -06:00
Vincent Lee f90f57fd16 Fix floating flower model loader 2020-01-14 21:24:04 -06:00
Hubry fe4d3157c3 Switch the initial recipe sync to a login packet
Should fix JEI not loading Botania recipes on server join. This removes
the need to run a resource reload to force JEI to pick them up
2020-01-15 01:05:39 +01:00
Hubry f65afb2aff "do it hubyr" - vazkii, 2020 2020-01-15 00:45:23 +01:00
Hubry 2195d9293a Fix #3142 2020-01-15 00:00:00 +01:00
Vincent Lee 2b87cd4bdb Stub out lightning stuff, doppleganger render 2020-01-14 16:53:08 -06:00
Vincent Lee f8d1b5aff0 Fix more stuff 2020-01-14 16:24:30 -06:00
Vincent Lee 80d9d106c1 Move red string rendering into the TESR itself 2020-01-14 14:39:57 -06:00
Vincent Lee 363dd5e04c Lots of shader renderlayer work 2020-01-14 14:27:21 -06:00
Vincent Lee ab170e94dd Enumify shaders in prep for renderlayers using them 2020-01-14 12:24:50 -06:00
Vasco Lavos f067c5a2b2 Update contributors.properties 2020-01-14 16:21:08 +00:00
Vincent Lee 601b6ce550 put all rendertypes together in one place, create explicit buffers for boundtiles so they actually can be batched 2020-01-13 22:08:30 -06:00
Vasco Lavos 7734609b9a Update contributors.properties 2020-01-14 01:30:13 +00:00
Vincent Lee 87e2526b58 Renderhelper and usages cleaned up 2020-01-13 18:43:03 -06:00
Vincent Lee 551104fc63 more work 2020-01-13 17:20:16 -06:00
Hubry 2dd96b87ce Fix orechid ignem JEI not working, reuse basic code for both orechids 2020-01-13 20:08:33 +01:00
Hubry 5d3ff952ea Exclude lexicon recipe from hiding input return recipes
It doesn't show up on MP servers otherwise.
2020-01-13 20:04:34 +01:00
Hubry d5001c79c8 Check direction of packets, don't overwrite recipes with sent ones in SP
Prevents lexicon upgrading after /reload losing other data on stack
2020-01-13 17:04:42 +01:00
Hubry e9166da71e Fix minor GL leak in inventory pylon renders, fixes #2850 2020-01-13 15:57:12 +01:00
Hubry 493d96e2ea Add stonecutting recipes for azulejos, closes #3139 2020-01-13 15:33:28 +01:00
Hubry e51eb07dc3 Use damage hook for mana consumption, let superclass handle axe/shovel
Fixes #3137
2020-01-13 14:55:31 +01:00
Vasco Lavos a4d2b151bd Update contributors.properties 2020-01-12 17:17:41 +00:00
ToMe25 d014ed627e Change some Recipes to use Tags (#3081)
Change the Terrasteel armor recipes to use the Terrasteel ingot tag instead of the item,
and change some recipes to use the Block tags from #3079
2020-01-11 18:51:24 -06:00
ToMe25 51eb16653f Add some block tags for compatibility (#3079)
* Add some block tags for compatibility

Add Terrasteel, Manasteel and Elementium Blocks to their own storage_blocks tag and the quartz variant blocks to forge:storageblocks/quartz.

* Fix using ingot tags for block tag

oops...

* Fix block tag using elven_quartz instead of elf_quartz

it may not look like it but i did test this before uploading xD
2020-01-11 18:51:05 -06:00
Vincent Lee fb8808168a switch water bowl to json system 2020-01-11 13:54:41 -06:00
Vincent Lee 41fabac3c9 Begin deprecation of IconHelper, moving a bunch of things that used it to their own generated baked models 2020-01-11 13:43:17 -06:00
Vincent Lee eecc0192a9 More misc work 2020-01-10 22:34:59 -06:00
Vincent Lee 7cf4afe271 more 2020-01-10 17:06:28 -06:00
Vincent Lee b4986a683a Half pass through TESRs 2020-01-10 14:49:20 -06:00
Hubry d1137b96d3 Reintroduce api version, because Vaz said so 2020-01-10 21:34:04 +01:00
Hubry cab1ce4737 Use the entity's speed in tangleberrie pushback, fixes #2085 2020-01-10 21:34:04 +01:00
Hubry 06effc1c44 Bump Patchouli version for scaling fix 2020-01-10 21:34:04 +01:00
stfwi f8ca7756b9 Added sideness check in SleepingHandler.trySleep(). (#3135)
* Added sideness check in SleepingHandler.trySleep().

* Spaces to tabs correction.
2020-01-10 14:28:10 -06:00
Vasco Lavos 601e27c618 Update contributors.properties 2020-01-10 20:06:26 +00:00
Vincent Lee 0ae8c3acf8 Pass through some rendering. This is gonna take a while. 2020-01-10 12:34:13 -06:00
Vincent Lee 24e777cab5 Fix most non rendering issues 2020-01-09 21:49:02 -06:00
Vincent Lee bafd2bfa6d bump patchouli 2020-01-09 18:40:54 -06:00
Hubry 3c1bcce64c Replace GoG seed drops with a loot table inject 2020-01-10 00:40:09 +01:00
Hubry 3dba43b122 Allow creative mana tablets and a tipped terra shatterer in JEI 2020-01-10 00:26:38 +01:00
Hubry 0d333e3a13 Add GoG-specific Orechid lexicon entry, unlocked after the Pure Daisy 2020-01-09 22:58:51 +01:00
Vasco Lavos 18558491c6 Update contributors.properties 2020-01-09 20:44:35 +00:00
Vincent Lee d82f1ca8cb WIP 1.15 2020-01-09 14:04:08 -06:00
Vincent Lee 2291ef09c8 Fix rannuncarpus including filled positions as candidates, causing it to slow down as spots get filled. Closes #3128 2020-01-08 23:34:57 -06:00
Vincent Lee ebb0aca7f4 Fix plentiful mantle rod particles being blocked by blocks in the way. Closes #3131 2020-01-08 23:23:20 -06:00
ToMe25 47af6e960e Add snow layering and particles to Snowflake Pendant (#3126)
* Add snow layering and particles to Snowflake Pendant

Make the Snowflake Pendant leave a trail of snow layers wherever you go while you aren't sneaking.
Add snowflake particles to the Snowflake Pendant.

* Add information about the snow layering to the...

...Lexica Botania.

* disable snow particles while sneaking
2020-01-08 13:58:37 -06:00
ToMe25 e9c0bfb57e Redo #3087 without the Terra Harvester itself (#3130)
* Basically redo the Add Terra Harvester PR without the Terra Harvester itself

* Fix some stuff the merging somehow messed up
2020-01-08 13:58:23 -06:00
Vincent Lee 4bdace7066 build again 2020-01-06 23:41:33 -06:00
Vincent Lee f43ca6bfd3 Fix skyblock spread command applying to the command executor not the argument 2020-01-06 23:38:04 -06:00
Vincent Lee 85526c5b01 build 2020-01-06 22:57:44 -06:00
Vincent Lee e79bfb6d9e Fix some edge cases in the previous 2020-01-06 22:47:16 -06:00
Vincent Lee 4c2466aa7d Sync pure daisy active positions normally instead of playing clever tricks. Closes #3125 and other desyncs 2020-01-06 22:27:19 -06:00
Al Winfy 02367bfa08 Improve lexicon.php to handle internal links (#3110) 2020-01-06 21:58:26 -06:00
ToMe25 72a985c8c9 Add Livingwood and Dreamwood Fences and Fencegates (#3105)
* Replace Livingwood and Dreamwood Walls with Fences and Fencegates

* Redo one change that didn't get saved

idk why it didn't get saved.

* oops

Fix an copy-paste error, luckily that was the only stuff i copy-pasted :)

* Delete en_us.json

WTF how could this file get here?

* Reupload en_us.json that somehow got into the...

... base dir of the repo.

* Add Livingwood and Dreamwood walls back.
2020-01-06 13:09:31 -06:00
ToMe25 4e91268474 Fix Cacophoniem working as Shield and Snowflake Pendant working while sneaking (#3102) 2020-01-06 12:27:21 -06:00
Hubry 1535ccbba4 Workaround for mana infusion going slow, closes #3120 2020-01-06 16:26:31 +01:00
Hubry 463331cbcf Fire hoe events if shovel has no effect, look up results in their maps
Fixes #3116
2020-01-06 16:19:48 +01:00
Vincent Lee ca495d6d5c Fix brews not returning the container after finishing them, fix vials looking like flasks when partially full 2020-01-05 19:31:17 -06:00
Al Winfy 04881bccac Add a whole honking bunch of crosslinks (#3119) 2020-01-05 13:19:42 -06:00
Vincent Lee db02e4939e Make some new mobs available through the cocoon 2020-01-04 12:53:50 -06:00
Vincent Lee a5a6530b63 Implement grouping for mana infusion recipes, use it for patchouli. Clean up alchemy recipes and update some cycles to include new 1.14 stuff 2020-01-04 12:30:22 -06:00
Vincent Lee 42d66aae21 Allow any two vanilla dyes to be used to make fertilizer, to prevent a bad gog biome spawn from obstructing progress 2020-01-04 00:20:44 -06:00
Vincent Lee 08e67e605b Fix laputa shard recipes. Closes #3107 2020-01-03 22:09:49 -06:00
Vincent Lee f3ecda8bb3 Switch skyblock chunk generator to a dummied-out overworld one. This means biomes are now intact, allowing location-based mob farms. Old GoG chunks will remain as plains biomes 2020-01-03 18:37:19 -06:00
ToMe25 37b0042cdd Fix Axes being too sharp and Shovels too slow (#3103)
* Fix Axes being too sharp and Shovels to slow

Fix Axes dealing 2 more damage than they should.
Fix Shovels being slower than they should.

* Delete ItemManasteelAxe from wrong location

* Delete ItemManasteelShovel from wrong location

* reupload Manasteel Tool classes to right location
2020-01-03 15:06:18 -06:00
Vincent Lee f6ca00b770 Fix website lexicon colors (interlinks still bork) 2020-01-03 15:03:31 -06:00
Vincent Lee bc1e1e04fe Interlinks for challenges 2020-01-03 14:57:50 -06:00
Vincent Lee 9514710ffd Replace hard-colors in lang files with patchouli-recommended $(item) and $(thing) 2020-01-03 14:16:37 -06:00
Vincent Lee 2778e6e2fe Add some interlinks in basics section. Eventually I'll get to all the other ones 2020-01-03 12:59:29 -06:00
Al WinfyandVincent Lee 71e98ece07 Make significant revisions to the Lexica Botania (#3067)
* Normalize some grammar and syntax

* Revisions for tutorial + basics

* More consistency fixes

* Revisions for mana section

* Revise Functional Flora section

* Run through the JSON with aspell

* Revise Generating Flora section

* Fix some odd grammar constructs

* More grammar/vocab tweaks

* Revise devices up to Hovering Hourglass (1/2)

* Finish revising device section (2/2)

* Begin revising Tools section (1/5)

* Revert non-Patchouli lang codes, because I'm an idiot

* Change a few entries to fit Patchouli pages better

* Patch more patchouli

* Continue Tools revision (2/5)

* Even more grammar tweaking

* More Tools revision (3/5)

* Remove a dangling entry

* More misc grammar tweaks

* Strip out outdated entries

* Continue Tools revision (4/5)

* Finish Tools revision (5/5)

* Revert grammar edit on meme

* Revise Azulejos' picture

* Make controls more agnostic (shift -> sneak)

* Revise Ender Artefacts (1/2)

* Patchouli tweaks

* Add more control-agnosticisms ('left-click' -> 'punch')

* Updates for 1.14.4 featuring

* Finish Ender Artefacts (2/2)

* Begin Curio Rewrite (& rename Bauble -> Curio) (1/2)

* Finish Curio rewrite (& rename Curio -> Trinket (oof)) (2/2)

* Rearrange some entries to fit pages

* Put back Spellbinding Cloth, as it's not deprecated anymore

* Rewrite Alfhomancy

* Remove unused/outdated entries

* Revise misc section

* Miscellaneous edits/tweaks

* Shorten entries to fit

* Rework apothecary + flower pictures

* Use williewillus' rewrite of Elven Lore

* Update the rest of the screenshots

* Some last tweaks

* Resolve merge conflict in ru_ru whoops

* Add back banners since they're not broken

* Fix dupes

* Implement Hubry's suggestions/fixes

* Fix formatting typo

* More Hubry fixes

* Fix embarrasing typo

* Add willie's fixes

* Whoops update Mana Pump

Co-authored-by: Vincent Lee <williewillus@users.noreply.github.com>
2020-01-03 11:28:10 -06:00
Vincent Lee 926ba69aa4 Fix cocoons not working 2020-01-02 22:39:00 -06:00
ToMe25 15ca502b2f Give the Paintslinger Lens the ability to paint all dyeable blocks (#3095)
* Give the Paintslinger Lens the ability to paint more blocks

Add Concrete, Concrete Powder and Glazed Terracotta blocks to the list of blocks that can be dyed with the Paintslinger lens.
Add unstained glass, glass panes and terracotta to the blocks the Paintslinger lens can paint.

* Change some var names in the IMCSender

to camelCase.
2020-01-02 18:34:44 -06:00
Vincent Lee 967e0888ec Fix #3086 2020-01-02 18:31:49 -06:00
Hubry 1d4616e689 Fix terraform rod giving up after the first valid block, closes #3099 2020-01-03 00:38:34 +01:00
Vasco Lavos d0be840163 Update contributors.properties 2020-01-02 17:56:52 +00:00
Vincent Lee ccf8abec56 Fix #3082 2020-01-01 23:16:07 -06:00
Hubry a3eb3f01ee Fix flugel tiara gliding, fixes #3092 2020-01-01 15:37:24 +01:00
Hubry 36342f17da Add config option to disable GoG lexicon spawn 2020-01-01 15:36:55 +01:00
Hubry 1c49c2a2ad Minor cleanup of the particle fix to avoid push/pop attrib 2020-01-01 15:08:24 +01:00
Hubry 991a48f29f Check the dimension generated for GoG worldgen, fixes #3090 2020-01-01 14:14:33 +01:00
Vincent Lee d892d6c3a4 Fix glDeleteShader being called on programs 2019-12-31 12:15:17 -06:00
Hubry b05378377b Fix GL state leak in particle rendering, fixes #3088 2019-12-31 17:51:57 +01:00
Vincent Lee 77b9574aa9 Mark website as utf8, closes #3083 2019-12-30 16:55:05 -06:00
Vincent Lee 2c6f3f8f22 Match class exactly for flower bag inventory 2019-12-30 16:49:06 -06:00
Vaelzan 74c1bb464f Fix ArrayIndexOutOfBoundsException in Flower Bag. (#3073)
Can't have i set to -1 and then access an ArrayList using that as the index immediately afterwards.
2019-12-30 16:45:35 -06:00
Vincent Lee 3d7dc85f5d Fix mana mirror counting as a tool 2019-12-30 16:40:35 -06:00
Vincent Lee 47114327a9 Build 2019-12-30 11:26:33 -06:00
Vincent Lee 1cc3ff50b7 exclude confirmed tag from stale 2019-12-30 11:20:07 -06:00
Vasco Lavos 11feaace15 Update contributors.properties 2019-12-30 08:26:23 +00:00
Hubry c4783d5e9b Fix missing items in creative tab, closes #3080 2019-12-28 22:18:38 +01:00
Vincent Lee b647196006 Fix thermalilies not dropping with cooldown tag, combine other CopyNBT functions into one 2019-12-27 22:00:18 -06:00
Vincent Lee c75abe2562 Make explicit whether true or effective position of a special flower is used. Fixes #3071 and other issues when flowers are spoofed 2019-12-27 21:44:27 -06:00
Vincent Lee b80845859f Fix red string blocks not rendering their effect 2019-12-27 20:42:00 -06:00
Al Winfy 6dbb46ee22 Make lexicon.php parse Patchouli codes (#3074) 2019-12-27 17:36:22 -06:00
Vincent Lee dac02cccd6 Fix gog versioning bug 2019-12-26 15:05:57 -06:00
Hubry ca1e0a6a35 Use vanilla glass as base for our glass, fixes #3070 2019-12-26 20:36:49 +01:00
Vasco Lavos a8bcc46afe Update contributors.properties 2019-12-26 19:28:51 +00:00
Hubry e1e95a872d Improve Corporea Index keybind requests (#3065)
Keybind requests now send an itemstack instead of the item name.
Items in inventories ignore their own NBT, NBT matching made less strict
Chat is no longer touched by keybind requests
Recipe book buttons can now be a source of keybind requests
Keybind requests work again with shift and ctrl
Matchers are in charge of their index request formatting
Index event now uses a matcher (this and previous change break api)
Indexes ignore spectators
2019-12-25 23:24:04 -06:00
Hubry 5e565aef45 Fix loot pool being unnamed, fixes #3066 (#3068) 2019-12-25 23:22:52 -06:00
Vincent Lee cdb38bdc63 Fix mana flame name. Closes #2929 2019-12-25 23:21:44 -06:00
Vincent Lee bca3f5c5fb Replace getSpawnerTag with getChildTag 2019-12-25 23:08:41 -06:00
Vincent Lee 285511fda8 Fix life aggregator not applying properly on place by using vanilla BlockEntityTag instead of rolling our own 2019-12-25 23:07:43 -06:00
Vincent Lee 9bbf0a23df Remove old GoG jar 2019-12-24 15:56:05 -06:00
Vincent Lee 13b7c66889 Release build 2019-12-24 15:55:18 -06:00
Hubry d4cab320a8 Fix spellbinding cloth doing literally nothing (#3064) 2019-12-24 15:47:37 -06:00
Hubry 7875372bb4 Fix gaia guardian hardmode advancement and cacophonium recipe (#3063) 2019-12-24 15:30:50 -06:00
Vincent Lee 8c47ce48ce update credits and faq 2019-12-24 15:11:30 -06:00
Hubry 554a34e8be Un-specialcase elven lexicon recipe, improve elven trade api (#3062) 2019-12-24 15:11:00 -06:00
Vincent Lee 566c29a809 Update gog page, partially fix lexicon page 2019-12-24 14:59:54 -06:00
Vincent Lee 4aeb955de9 Clarify spellcloth can remove curses 2019-12-24 13:29:16 -06:00
Vincent Lee ed1c600d45 Brew and incense tooltips now render consistently with vanilla potions 2019-12-24 13:10:14 -06:00
Vincent Lee cbe78aa15b Fix santaweave armor names, other incorrectly-colored tooltips 2019-12-24 12:58:18 -06:00
Vincent Lee 3a3bfcd0b3 Restore water bowl model 2019-12-24 12:30:11 -06:00
Vincent Lee e0762529e2 Why not? 2019-12-24 12:13:33 -06:00
Vincent Lee 001a4e1813 Delete old lexicon category icons 2019-12-24 12:02:36 -06:00
Vincent Lee 0283d5d8f3 Clean up lang files of old lexicon stuff, also fix entity names in non-en_us files 2019-12-24 12:02:18 -06:00
Vincent Lee d8bf82700c Move contributing/issue template to .github 2019-12-24 11:26:04 -06:00
Vincent Lee 4cd0532336 Wacko 2019-12-24 11:18:02 -06:00
Vincent Lee b3770a069a Fix #2877, replacement of #2962 2019-12-24 11:16:59 -06:00
Hubry ddbeafa582 Move exoflame heatable to a cap, convert furnace part to use it (#3061)
* Replace curio cap provider with a more generic one

* Move exoflame heating to a cap, move the last part to bellows
2019-12-24 10:56:46 -06:00
Vincent Lee b80c3ca505 Patchouli tweaks 2019-12-23 16:19:54 -06:00
Vincent Lee c0e9e8f105 Cleanup 2019-12-23 15:52:19 -06:00
Vincent Lee 144cd96add Refine corporea PR, fix interceptors being broken 2019-12-23 15:49:36 -06:00
Vincent Lee 5a7f3a8a11 Corporea funnels now detect vertical item frames 2019-12-23 15:25:13 -06:00
Vincent Lee 6a19638e89 Merge pull request #3060 from Alwinfy/corporea
Overhaul Corporea to pass around CorporeaRequestMatchers instead of Objects
2019-12-23 15:24:41 -06:00
Alwinfy 0b25326383 And one more formatting thing 2019-12-23 13:26:10 -06:00
Alwinfy fe9341791d Make CorporeaRequestMatcher an interface 2019-12-23 12:58:52 -06:00
Alwinfy c613b82e45 Fix some minor formatting (thanks Hubry) 2019-12-23 12:58:04 -06:00
Alwinfy a0908c9319 Overhaul Corporea to pass around CorporeaRequestMatchers instead of Objects 2019-12-23 10:11:28 -06:00
Vincent Lee 468d2ec253 Merge master 2019-12-22 18:56:24 -06:00
Vincent Lee 7243d31567 Create stale.yml 2019-12-22 18:38:30 -06:00
Vincent Lee b234d2e199 beta build 2019-12-22 17:03:05 -06:00
Vincent Lee c7431c7bc7 Fix #3055 2019-12-22 16:55:24 -06:00
Vincent Lee 517e5139f5 Fix changelog 2019-12-22 12:40:07 -06:00
Vincent Lee 4a327fe3ea final 1.12 build 2019-12-22 12:38:15 -06:00
Vincent Lee da5918e46c First pass: Restore GoG, clean up some lexicon stuff 2019-12-21 23:37:36 -06:00
Vincent Lee a641aed1b2 Fix Gaia Guardian crashes in certain cases, also fix them being leashable, and disable music repetition due to vanilla/lwjgl bug 2019-12-21 16:09:08 -06:00
Vasco Lavos b0f31ec5dd Update contributors.properties 2019-12-21 18:15:27 +00:00
Vincent Lee 4278380a43 Merge pull request #3059 from Hubry/redstringcontainer
Fix red string container destroying caps and popping off sparks sometimes
2019-12-21 00:06:02 -06:00
Hubry f3b36299e8 Fix redstring container destroying caps and popping off sparks sometimes 2019-12-21 00:40:12 +01:00
Vasco Lavos 4baccf84a3 Update contributors.properties 2019-12-18 20:06:46 +00:00
Vincent Lee 55a0f3e04e Fix #3054 2019-12-17 22:15:53 -06:00
Vasco Lavos 5cd7b835bb Update contributors.properties 2019-12-17 18:11:32 +00:00
Vincent Lee 07c0414f62 Delete unused modcraftingrecipes 2019-12-16 11:45:08 -06:00
Vincent Lee 31e0e57b81 cleanup 2019-12-16 11:41:27 -06:00
Vincent Lee 6bf3869361 same for enchanter 2019-12-16 11:37:59 -06:00
Vincent Lee 733666b440 same for alf portal 2019-12-16 11:19:26 -06:00
Vincent Lee eee165556a terraplate now checks using patchouli multiblock 2019-12-16 10:53:13 -06:00
Vincent Lee a683d2442a Fix spreaders and force relay being spawnable 2019-12-16 10:32:02 -06:00
Vincent Lee 7acdb06518 Swap ring now recognizes shulker boxes 2019-12-16 09:47:48 -06:00
Vincent Lee 59636634df Hopperhocks now detect vertically-facing item frames. Also fix probably bugs with double chests. 2019-12-14 15:04:48 -06:00
Vincent Lee bb8563cd7a Spark mana particles no longer collide, closes #3033 2019-12-14 13:58:57 -06:00
Vincent Lee cf14df38ec Merge pull request #3047 from nekosune/master
Added Quartz blocks to OreDict
2019-12-14 13:48:10 -06:00
Vincent Lee 1eb2885d6e Merge pull request #3049 from Hubry/headflower
Fix head flower render
2019-12-14 13:33:43 -06:00
Hubry a64709a868 Fix head flower render 2019-12-14 19:54:03 +01:00
Vincent Lee 72711501d7 Remove handed-bias from mana bursts to match vanilla bows, fixes #2983 2019-12-14 01:02:15 -06:00
Vincent Lee 2b21223981 Fix #3039 2019-12-11 12:51:58 -06:00
Vincent Lee 1b1e746872 World seed only works in dimensions that can be respawned in 2019-12-11 12:24:55 -06:00
Vincent Lee 863cd66d74 beta build 2019-12-11 12:08:09 -06:00
Vincent Lee 4c574fdfff Bump mods.toml deps 2019-12-10 17:00:30 -06:00
Vincent Lee ffa3bc91dd Reimplement sextant using patchouli multiblocks 2019-12-10 16:43:02 -06:00
Vincent Lee ca2458a061 Fix vanilla orechid recipes being missing, and make orechid resilient to no entries 2019-12-09 17:07:15 -06:00
nekosune ca767924f9 Added Quartz blocks to OreDict
Added Quartz blocks to OreDict
2019-12-08 16:46:21 -05:00
Vincent Lee 86cce0d8bc Merge pull request #3046 from Hubry/spreader-binding
Fix spreader binding always aiming for 0,0,0
2019-12-08 15:34:49 -06:00
Vincent Lee 99178c3005 Merge pull request #3045 from Hubry/lexicon-share
[1.12] Fix lexicon share crashing if you don't have the lexicon in main hand
2019-12-08 15:34:23 -06:00
Hubry 8a1b736367 Fix spreader binding always aiming for 0,0,0 2019-12-08 21:44:13 +01:00
Hubry 346581e23d Fix lexicon share crashing if you don't have the lexicon in main hand 2019-12-08 19:50:19 +01:00
Vincent Lee e3330e58a2 Merge pull request #3042 from Hubry/albedo-pls
[1.12] Migrate Albedo compat to caps, fixing NPEs on null lights on new Albedo
2019-12-08 12:34:05 -06:00
Vincent Lee cacec3d959 Merge pull request #3043 from Hubry/lolshedding
[1.12] Fix shedding page NPE, fix entity render making the world fullbright
2019-12-08 12:33:40 -06:00
Vincent Lee f5823b7644 Merge pull request #3044 from Hubry/bauble-right-click
[1.12] Fix exception on equipping Botania baubles over cap-only baubles
2019-12-08 12:32:57 -06:00
Hubry a25be332a1 Fix #3026 exception on equipping Botania baubles over cap-only baubles 2019-12-08 18:42:47 +01:00
Hubry 6ab3ec39f6 Fix shedding page NPE, fix entity render making the world fullbright 2019-12-08 18:03:37 +01:00
Hubry 050d11a547 Migrate Albedo compat to caps, fixing NPEs on null lights on new Albedo
Fixes #2920, fixes #3040
2019-12-08 17:16:51 +01:00
Vincent Lee d8c0adc60a Use saved attributes for rings. Closes #3027 2019-12-05 22:22:11 -06:00
Vincent Lee 2ad10a4601 Redo flugel eye using globalpos, closes #3032 2019-12-05 22:00:37 -06:00
Vincent Lee 0a947d806c Delete ISpecialFlower interface 2019-12-05 21:43:53 -06:00
Vincent Lee 9593c82e0e Move mystical flower and double flower tags to datagen. Also remove some unnecessarily specific tags. 2019-12-05 21:35:06 -06:00
Vincent Lee 939195fc67 Move floating flower tags to datagen 2019-12-05 21:12:28 -06:00
Vincent Lee 3804675961 Fix animated torch being xray, fix starfield not spawning particles 2019-12-05 19:31:50 -06:00
Vincent Lee 038058a91e Merge pull request #3035 from Hubry/curio-render
Adjust head bauble rendering so it doesn't look as broken
2019-11-29 18:18:29 -06:00
Vincent Lee fa6ffc4ccb Merge pull request #3034 from Hubry/patchouli
Set up custom recipe mappings for things missing them, add GoG page for now
2019-11-29 18:18:06 -06:00
Hubry 6ca60d507d Adjust bauble rendering so it doesn't look as broken
...until you sneak or trapdoor yourself or swim.
2019-11-30 00:26:53 +01:00
Hubry 9f1f6e47c0 Set up custom recipe mappings for things missing them 2019-11-29 22:23:49 +01:00
Vincent Lee 3e8f508bf2 Delete unneeded greater magnet ring class 2019-11-25 18:31:24 -06:00
Vincent Lee 6539e9fb1d Fix #3029 2019-11-25 18:22:45 -06:00
Vincent Lee e56b415eb0 beta build 2019-11-24 23:55:28 -06:00
Vincent Lee 8f1139348c Delete old challenge code 2019-11-24 23:10:17 -06:00
Vincent Lee cbe7ec5082 Corporea index no longer xrays the world, nor messes up keybindings in-inventory. Also clean up the code a bit" 2019-11-24 23:08:12 -06:00
Vincent Lee f433ee8858 Tracker 'thrower' of mana bursts and use that for terra sword 2019-11-22 01:18:50 -06:00
Vincent Lee d54ebc610d Fix #3024 2019-11-21 11:35:07 -06:00
Vincent Lee a1d05345df Fix pump render completely. Closes #3022 2019-11-19 23:10:03 -06:00
Vincent Lee 5503ea427f pools now use the breaking particle corresponding to their own tier 2019-11-19 12:01:45 -06:00
Vincent Lee 4315a9e460 Use vanilla to render the pool in a pool minecart, clean up pool tesr a bit 2019-11-19 11:58:00 -06:00
Vincent Lee 53ea3b9bf3 Partially restore pump render (doesn't move yet) 2019-11-19 11:40:00 -06:00
Vasco Lavos 6666cf1e23 Update contributors.properties 2019-11-19 13:42:36 +00:00
Vincent Lee 5c9246ca8d nerf new quark feature a bit 2019-11-17 23:59:36 -06:00
Vincent Lee b21e154c8f Fix spectrolus eating non-wool items. Wool items in the wrong sequence will still be destroyed, as in 1.12. Also remove a few unused classes 2019-11-17 23:57:22 -06:00
Vincent Lee 9fdc871d1e Clean up block loot provider 2019-11-15 12:23:13 -06:00
Vasco Lavos dbd2236cd9 Update contributors.properties 2019-11-15 10:13:52 +00:00
Vincent Lee 6009491ed2 Beta build 2019-11-14 16:04:58 -06:00
Vincent Lee ca369ba6dc Fix rod of the skies cooldown not taking effect nor showing up, also fix it not working in the offhand 2019-11-14 16:03:34 -06:00
Vincent Lee ab027fcab9 Tiny potato actions (jumping, petting, hearting) now show to others in multiplayer. Very important. 2019-11-14 15:36:45 -06:00
Vincent Lee bda4cc70b6 Fix 'break and replace' exploits for gourmaryllis and spectrolus. Migrate all previous NBT-saving to vanilla's BlockEntityTag and loot tables 2019-11-14 14:25:56 -06:00
Vincent Lee 691e788473 Fix force relays dropping bindings on chunk reload 2019-11-13 18:57:20 -06:00
Vincent Lee 7306492adf Many cleanups around the wand of the forest, tweaks to force relays
* Split stuff out of the monster main method
* Wand must now be in bind mode to act on force relays
* Right clicking a force relay in function mode now shows the existing binding, if any
2019-11-13 18:38:39 -06:00
Vincent Lee 90aba57049 Fix some textcomponent-string comparisons 2019-11-13 17:52:47 -06:00
Vincent Lee 7b2fd3db48 Fix jaded amaranthus placement logic 2019-11-13 16:47:02 -06:00
Vincent Lee 7bb36d49fb Allow radius highlights to be visible from below, useful with floating flowers. 2019-11-13 15:50:22 -06:00
Vincent Lee e4cd803425 More snow fixes 2019-11-13 15:44:46 -06:00
Vincent Lee 3fdea4c605 Make close check for bag/box more robust 2019-11-13 15:38:11 -06:00
Vincent Lee 9493ca8548 More cleaning 2019-11-13 15:14:10 -06:00
Vincent Lee aca7563514 Fix snow block pure daisy recipe 2019-11-13 14:59:33 -06:00
Vincent Lee 57f807ff30 Other misc housekeeping, replace direwolf20 spotlight on homepage with the 1.10 one (instead of the 1.7 one lol) 2019-11-13 14:49:23 -06:00
Vincent Lee 4ef7cbe4db Website deployment wasn't working so redo it 2019-11-13 14:35:30 -06:00
Vincent Lee 230627f7e5 Fix gradle derp 2019-11-13 12:48:50 -06:00
Vincent Lee 819172c14f Fix incrementVersionNumber task 2019-11-12 21:50:45 -06:00
Vincent Lee 18b23e3704 beta build 2019-11-12 21:46:35 -06:00
Vincent Lee 1580ea8869 Tweak mods.toml 2019-11-12 21:33:36 -06:00
Vincent Lee db8b866e23 Bump mappings 2019-11-12 18:47:43 -06:00
Vincent Lee b8b2ed5ff3 Partially restore bauble box 2019-11-12 11:21:33 -06:00
Vincent Lee eb0c2e6521 Fix flower bag gui 2019-11-12 10:59:38 -06:00
Vincent Lee 65f6148dcf Fix armor set tooltip having wrong item name 2019-11-11 22:51:28 -06:00
Vincent Lee 84537a7495 Always sync curios, fixes some desyncs. Also clarify that ring of far reach only works on blocks (for now?) 2019-11-11 17:30:59 -06:00
Vincent Lee 1e8c3fce46 Fix lexicon entry 2019-11-11 14:56:45 -06:00
Vincent Lee 545abdd923 tweak prev 2019-11-11 14:48:38 -06:00
Vincent Lee ce30444ba7 Rework ring of chordata. Closes #2804, closes #3011 2019-11-11 14:37:26 -06:00
Vincent Lee 9c0b4ceac9 Fix a bunch of te's dropping contents on state change 2019-11-11 13:06:45 -06:00
Vincent Lee 0898173bb2 Call markDirty properly in a bunch of places, notably when mana changes. Encapsulate mana in magical flowers 2019-11-11 12:45:49 -06:00
Vincent Lee 886e8b0bcc Beta build 2019-11-11 00:55:49 -06:00
Vincent Lee 96df06afbc Fix #3012, I am big dumb 2019-11-11 00:46:22 -06:00
Vincent Lee 691b10f2fe Fix alfheim portals being weird. Closes #3017 2019-11-11 00:36:57 -06:00
Vincent Lee e9d8e2009b Blacklist some biomes from flower spawning. Closes #3000 2019-11-11 00:22:45 -06:00
Vincent Lee a7e4e26e06 Fix #3016 composite lens names 2019-11-11 00:08:04 -06:00
Vincent Lee 45b3dd3bab Migrate uses of color4ub to glstatemanager (4 years late but..) 2019-11-10 23:57:59 -06:00
Vincent Lee e35fbac245 Fix some bindings showing up at 0,0 instead of at the block 2019-11-10 23:45:37 -06:00
Vincent Lee 7708fe4395 Binding particles now respect random offsets. Closes #3014 2019-11-10 23:30:57 -06:00
Vincent Lee b2050f5625 Fix #3010 2019-11-10 23:15:00 -06:00
Vincent Lee 5e4b1e6f37 Fix #3013 2019-11-10 22:36:09 -06:00
Vincent Lee b81dd3fc78 beta build 2019-11-09 11:19:39 -06:00
Vincent Lee 729f8635e5 Fix mana items in the main inventory not causing the mana bar to appear 2019-11-09 11:13:06 -06:00
Vincent Lee 16e1e95a7d Fix manasteel pick and axe HUD showing the wrong icon 2019-11-09 11:07:46 -06:00
Vincent Lee 45bca55d9a Remove distance limit from te sync, just send to all trackers. Should fix the ghost sparkles on the pure daisy and other issues. 2019-11-09 11:00:21 -06:00
Vincent Lee 8a8046ae81 Fix halos not being usable. Closes #3006 2019-11-09 10:58:44 -06:00
Vincent Lee cf5d748194 Fix cacophonium not dropping its proper drops, closes #3005 2019-11-09 10:46:44 -06:00
Vincent Lee 2bf871cb3b Redstone roots can now be crafted with both ferns and 1-tall grass. Closes #3007 2019-11-09 10:20:50 -06:00
Vincent Lee 5e478f5ff7 Fix elementium tool repair material being wrong, and fix tornado rod yeeting too hard, closes #3004 2019-11-08 22:00:55 -06:00
Vincent Lee 227b0d0dc8 build a beta 2019-11-08 12:01:25 -06:00
Vincent Lee b4acedb9ac Fix armor model rendering and cleanup the code a bit 2019-11-08 12:01:25 -06:00
Vincent Lee 363c2a9919 Optimize ghost rail 2019-11-08 12:01:24 -06:00
Vasco Lavos df9e4a94a8 Update contributors.properties 2019-11-08 04:39:08 +00:00
Vincent Lee a5f92e94c6 Merge pull request #2992 from iTitus/jei-fixes
JEI Fixes
2019-11-06 20:12:38 -06:00
Vincent Lee a2b2b3e4c6 Fix ghost rail iteration CME 2019-11-06 16:45:43 -06:00
Vincent Lee cd435822d7 Fix gaia head rendering on players, additionally now renders correctly on mobs that can wear skulls 2019-11-06 16:14:21 -06:00
Vasco Lavos 3fe6291655 Update contributors.properties 2019-11-04 08:43:22 +00:00
Vasco Lavos 78d77571b8 h 2019-11-02 21:27:37 +00:00
Vincent Lee 7cabf5f736 Merge pull request #2998 from Hubry/jeistuff
Fix some subitems not showing up in JEI, rearrange JEI categories to make more sense
2019-11-02 11:09:16 -05:00
Hubry 288b2c8314 Fix some subitems not showing up in JEI, rearrange JEI categories 2019-11-02 12:32:47 +01:00
Vasco Lavos d4e74d0ae7 Update contributors.properties 2019-11-02 02:12:36 +00:00
Vasco Lavos c732587fe2 Update contributors.properties 2019-11-01 23:06:10 +00:00
Vincent Lee 391981e4ff 'Fix' ccc item render 2019-11-01 17:54:09 -05:00
Vincent Lee b22d23f143 Bump forge requirement 2019-11-01 17:29:33 -05:00
Vincent Lee 79841d0163 Exclude datagenerator cache from jar 2019-11-01 17:20:02 -05:00
Vincent Lee 7e80e95790 Generate data for beta 2019-11-01 17:08:21 -05:00
Vincent Lee cec011d1ec Rebalance 2019-11-01 14:14:10 -05:00
Vincent Lee ee0db24161 Fix lexicon message 2019-11-01 14:09:04 -05:00
Vincent Lee 0641cc78fd New quark feature 2019-11-01 14:05:34 -05:00
Vincent Lee 80458945fa Delete old vendored apis 2019-10-31 11:13:24 -05:00
Vincent Lee e7d3fd469a Cleanup, remove random junk in the repo 2019-10-31 11:04:59 -05:00
Vincent Lee a158215fb0 More cleanups, optimize imports 2019-10-31 10:51:48 -05:00
Vincent Lee d00349cbc7 Yeet all the lexicon and multiblock code (this temporarily kills the sextant, which will be reimplemented on top of the patchouli multiblocks 2019-10-30 23:54:03 -05:00
Vincent Lee 8bdf758bab Fix vineballs 2019-10-30 17:04:00 -05:00
Vincent Lee 4a4b11c44a Fix item models, finally done 2019-10-30 14:53:06 -05:00
Vincent Lee 898112885d Fix the lag, fix double rendering when staticfloaters is on 2019-10-30 14:04:02 -05:00
Vincent Lee d2654234ba Fixed in-world floating flower rendering 2019-10-30 13:43:20 -05:00
iTitus 7d7302b959 Fix model jsons so that a pool can render as full via overrides.
Overrides aren't supported in block models apparently.
2019-10-30 10:25:45 +01:00
iTitus f21767ea18 Fix Pure Daisy 2019-10-30 10:25:45 +01:00
Vincent Lee b86f7289b4 Try to fix the tesrs but theyre not being called 2019-10-30 01:49:57 -05:00
Vincent Lee 30bc385a68 small cleanup 2019-10-30 01:40:27 -05:00
Vincent Lee bb886f49e4 Floaters all rendering properly statically 2019-10-30 01:37:58 -05:00
Vincent Lee eadfa10e82 Prepwork to restore floating flower rendering in the static case 2019-10-30 01:04:56 -05:00
Vincent Lee 1ff8cf6fe2 Fix crash when changing island types of floaters 2019-10-29 23:17:30 -05:00
Vasco Lavos c63a2b8281 Update contributors.properties 2019-10-29 19:39:50 +00:00
Vincent Lee fb5491a4d4 Move datagenerators to their own toplevel package 2019-10-29 11:18:18 -05:00
Vincent Lee 949dee7dd7 Fix pinkinator not keeping custom name of wither 2019-10-29 11:13:39 -05:00
Vincent Lee 25b8b8ee2f Fix some entities having incorrect size 2019-10-29 11:03:20 -05:00
Vincent Lee d6d329adf9 Fix mana mirror saving dimension incorrectly 2019-10-29 10:46:04 -05:00
Vincent Lee 70f1cc5d22 small cleanup 2019-10-29 00:56:48 -05:00
Vincent Lee a04efef8a8 Use UTF8 encoding explicitly in string byte conversions 2019-10-29 00:44:42 -05:00
Vincent Lee a7a0c1c37d Bump forge, move shaders to vanilla's GLX class instead of accessing ARB directly 2019-10-29 00:14:08 -05:00
Vasco Lavos 751b285371 Update contributors.properties 2019-10-25 23:43:53 +01:00
Vincent Lee cfc1a37360 Use vanilla's GlobalPos instead of our home-rolled DimWithPos 2019-10-25 00:45:40 -05:00
Vincent Lee 8fb418f12d Clean up more old stuff, make lexica open and close animation work again 2019-10-23 00:13:06 -05:00
Vincent Lee 4af6e06e48 Fix disappearance issues 2019-10-22 20:00:36 -05:00
Vincent Lee 931630df34 Fix corporea crystal cube transparency/position, still getting disappearance issues 2019-10-22 19:51:22 -05:00
Vincent Lee 5275422230 Disable early startup window for clients as well because it's annoying and slow 2019-10-22 19:08:06 -05:00
Vincent Lee 9d81772d48 More stonecutting recipes 2019-10-22 19:07:05 -05:00
Vincent Lee febe12e680 Add stonecutting data provider and stonecutting recipes 2019-10-22 18:22:59 -05:00
Vincent Lee 7ac78d9df2 delete armature/asm folders 2019-10-22 17:22:23 -05:00
Vincent Lee 2efc9d0ed4 Fix incorrect texture on metamorphic taiga cobble slab 2019-10-22 17:21:27 -05:00
Vasco Lavos b855abbd43 Update contributors.properties 2019-10-22 20:07:33 +01:00
Vincent Lee 4cde332ef8 Generate vanilla tags (rail, stair, slab, wall) with data generators 2019-10-22 13:39:09 -05:00
Vincent Lee 161276a1f3 ignore datagenerator cache file due to path separator bug 2019-10-22 12:45:22 -05:00
Vincent Lee e38cbcecc9 Update contributing docs 2019-10-22 11:53:07 -05:00
Vincent Lee 3be659c0d6 Merge branch '1.14' of github.com:Vazkii/Botania into 1.14 2019-10-22 11:47:44 -05:00
Vincent Lee 51935c5542 R.I.P. 2019-10-22 11:46:53 -05:00
Vincent Lee 94939169f3 Add readme for generated, also remove deobfJar task 2019-10-22 11:46:37 -05:00
Vincent Lee e89d606c08 Move block loot tables to data generators 2019-10-22 11:43:56 -05:00
Vincent Lee a50d5fdc73 Merge pull request #2997 from Hubry/bruh
Set up advancement locking, mildly rearrange advancements
2019-10-21 23:10:58 -05:00
Vasco Lavos 8d2dfeb887 Update contributors.properties 2019-10-21 23:33:37 +01:00
Hubry 6b902f4ada Set up advancement locking, mildly rearrange advancements 2019-10-21 22:10:19 +02:00
Vincent Lee 6a67728a1a Readd challenges as manual quest pages 2019-10-21 11:19:15 -05:00
Vincent Lee 02cdff2325 $(r) doesn't exist, it's $() 2019-10-21 10:27:44 -05:00
Vincent Lee f07a7c1220 Fix some item tooltips not being greyed, fix petals having incorrect name, fix lexicon open advancement being unobtainable 2019-10-18 15:03:27 -05:00
Vincent Lee 4fac487589 Remove open and share commands and their corresponding vestiges from lexicon files, remove word counter 2019-10-18 14:31:29 -05:00
Vincent Lee d69389a32e Tweak recipe syncing 2019-10-18 12:42:53 -05:00
Vincent Lee 435e5e4ff0 Clean up how the apothecary stores its fluids, probably eliminates some consistency bugs when the water/lava flags were out of sync 2019-10-18 12:10:53 -05:00
Vincent Lee 7ffdc27c49 Fix a ton of side safety issues 2019-10-18 11:48:08 -05:00
Vasco Lavos 63ecac9d56 Update contributors.properties 2019-10-18 16:46:59 +01:00
Vincent Lee 2fea94a85d Modernize burn time querying 2019-10-16 16:52:34 -05:00
Vincent Lee c09915fc20 'Fix' the vitreous pickaxe 2019-10-16 11:40:30 -05:00
Vincent Lee 073730dbcd Delete wiki code. Fix cacophonium recipe. 2019-10-15 17:12:42 -05:00
Vincent Lee 3e9314d4f0 Merge pull request #2990 from Hubry/patchouli-lang
Patchouli entry colors and entry formatting migration
2019-10-14 20:32:12 -05:00
Hubry 8ab71aaf73 Patchouli entry colors and entry formatting migration 2019-10-14 23:27:52 +02:00
Vasco Lavos 5324a08d59 Update contributors.properties 2019-10-11 20:43:25 +01:00
Vincent Lee b2682fd143 Fix a bunch of entities not spawning properly 2019-10-11 13:48:57 -05:00
Vincent Lee 7fe136d400 Move particles even closer to vanilla systems. i.e. render them at the same time as regular particles, not in the RenderWorldLastEvent. Bump forge. 2019-10-11 13:36:00 -05:00
Vincent Lee 8d759ff126 Merge branch '1.14' of github.com:Vazkii/Botania into 1.14 2019-10-09 21:07:06 -05:00
Vincent Lee 589fe30964 Hoist some particle data decls, eliminates some allocations 2019-10-09 21:06:11 -05:00
Vasco Lavos 7a254a1e34 Update contributors.properties 2019-10-09 22:01:46 +01:00
Vincent Lee a71d31d7fc Merge pull request #2986 from Hubry/tags
Some minor tag handling cleanup
2019-10-08 16:04:20 -05:00
Vincent Lee 4b77da29be Merge pull request #2985 from Hubry/curio-reorg
Reorganize curios back to what they were in 1.12
2019-10-08 16:03:24 -05:00
Vincent Lee 6c1a9af6ca Render both upgrade and star :smart: 2019-10-08 15:30:09 -05:00
Hubry 4f97c8e861 Centralize tag handling 2019-10-08 18:52:21 +02:00
Hubry 490dd4525f Reorganize curios back to what they were in 1.12
Curios 1.0.2 added a "curio" tag which is basically
the Baubles "trinket" type (can go into any slot)
2019-10-08 18:11:02 +02:00
Vincent Lee d798e44e8c Allow sparks to have different color networks like corporea. For now, show by coloring the upgrade icon, and displaying the corporea star if there is no upgrade 2019-10-07 19:40:34 -05:00
Vincent Lee be6d7f610e Make an advancement of elven knowledge. Code side is super messy mix of old and new systems right now, but we can clean it up later. 2019-10-05 14:00:33 -05:00
Vincent Lee f1d38877d9 Point to existing lexicon item (needed for our yellow border highlight + lexicon model stuff). Also fix tall grass conjuration not conjuring anything. 2019-10-05 13:23:45 -05:00
Vincent Lee df8fc76c48 Fix #2975, fix #2976 2019-10-05 12:40:19 -05:00
Vincent Lee 74055595ba Mark patchouli as a dep 2019-10-05 12:05:22 -05:00
Vasco Lavos d588ca4909 Update contributors.properties 2019-10-05 12:18:23 +01:00
Vincent Lee 4a9bf8b675 Merge pull request #2981 from Hubry/more-patchouli
Tweak templates, remove workarounds, mark some entries as default read
2019-10-04 16:54:52 -05:00
Hubry fc65cbd1f5 Tweak templates, remove workarounds, mark some entries as default read 2019-10-03 20:20:49 +02:00
Vasco Lavos f87e3c5c17 Update contributors.properties 2019-10-01 05:38:33 +01:00
Vincent Lee 90977798d4 Partially restore corporea crystal cube model 2019-09-27 22:37:45 -05:00
Vincent Lee bf79be5210 'Fix' shader loading 2019-09-27 12:02:09 -05:00
Vincent Lee 43c5fadce5 Misc todo fixes and cleanups 2019-09-27 11:27:22 -05:00
Vincent Lee 8553a4d5df Fix placing platforms against platforms not playing the place sound 2019-09-27 10:49:33 -05:00
Vincent Lee a3b7f1c4b0 Combine camo and platform classes, they didn't ever need to be separate 2019-09-27 10:43:54 -05:00
Vincent Lee 172119701c Merge branch '1.14' into patchouli 2019-09-24 16:52:33 -05:00
Vincent Lee ffc8deaaed Merge pull request #2977 from Hubry/patchouli
Port lexicon pages to Patchouli, improve generator code
2019-09-24 16:41:54 -05:00
Hubry ab412507c7 Port lexicon pages to Patchouli, improve generator code 2019-09-24 23:16:29 +02:00
Vasco Lavos c5b6304118 Update contributors.properties 2019-09-24 00:09:40 +01:00
Vasco Lavos 62f8a85080 Update contributors.properties 2019-09-21 17:15:41 +01:00
Vasco Lavos 6237a4f428 Update contributors.properties 2019-09-21 17:15:26 +01:00
Vasco Lavos 800f47b41c Update contributors.properties 2019-09-18 07:30:55 +01:00
Vincent Lee e776471525 End of an era (closes #2973) 2019-09-17 21:03:57 -05:00
Vincent Lee dca3c28cca Diva charm no longer brainwashes boss mobs. Closes #2921 2019-09-17 21:03:04 -05:00
Vasco Lavos fecf1b5c06 Update contributors.properties 2019-09-16 18:56:57 +01:00
Vincent Lee 2f5d163427 Fix use of client only method 2019-09-14 20:07:26 -05:00
Vincent Lee b4e0a076e7 Finish migrate to vanilla particle sys 2019-09-14 19:50:52 -05:00
Vincent Lee f0993c20a4 Prep for moving to vanilla particle system 2019-09-14 18:16:13 -05:00
Vincent Lee 4cd4b220d3 Fix curios version string, fix armors not using mana for durability, fix fluid display in pure daisy JEI 2019-09-14 12:36:04 -05:00
Vincent Lee 3bc86fbc54 prep cf changes 2019-09-14 11:59:37 -05:00
Vincent Lee b0ec69f1f0 Require curios 2019-09-14 11:58:33 -05:00
Vincent Lee a3b6a2ca6b Fix missing mossy dremawood planks model, semi-fix ghost rails 2019-09-14 11:47:17 -05:00
Vincent Lee 35df76b230 remove wrapping log 2019-09-13 23:22:22 -05:00
Vincent Lee cdf4a26a94 Fix swapped color in lens dying 2019-09-13 23:22:04 -05:00
Vincent Lee a56dd81eed Fix spawn packet for bursts 2019-09-13 22:00:39 -05:00
Vincent Lee 107097af0d Fix some dumb bugs and crashes 2019-09-13 21:55:33 -05:00
Vincent Lee 7d318bb3bf Merge 1.12 2019-09-13 18:12:46 -05:00
Vincent Lee 3c2de8453e bump forge to rb, fix fluid stuff 2019-09-13 17:48:37 -05:00
Vincent Lee 7aca7bbac1 build 2019-09-09 22:22:13 -05:00
Vasco Lavos f03b91c67d Update contributors.properties 2019-09-10 00:22:24 +01:00
Vincent Lee 6ba1436ac0 Fix improper dumping of registry names in brew entries 2019-09-09 00:11:26 -05:00
Vincent Lee e9aa92efec Finish multiblocks 2019-09-09 00:04:38 -05:00
Vasco Lavos 29d158617e Update contributors.properties 2019-09-08 02:09:38 +01:00
Vasco Lavos bbeba2b52f Update contributors.properties 2019-09-01 19:12:29 +01:00
Vasco Lavos 4847cb8f2e Update contributors.properties 2019-08-30 17:52:14 +01:00
Vasco Lavos cf4fa0d6cd Update contributors.properties 2019-08-30 01:22:19 +01:00
Vincent Lee dad9192a8d Couple of multiblocks 2019-08-27 19:12:49 -05:00
Vincent Lee f2616f99c6 Add in dummy templates so the game doesnt crash 2019-08-27 18:09:11 -05:00
Vincent Lee d1636c79fb use patchouli native crafting page for single recipe pages 2019-08-27 17:36:20 -05:00
Vincent Lee 6966e620c4 Rename files to snake case, fix special flower category names 2019-08-27 17:08:49 -05:00
Vincent Lee 0e187f0756 dumper code + temporary dumped results 2019-08-27 16:39:31 -05:00
Vincent Lee 218fb4c2c7 experimenting with patchouli 2019-08-26 16:01:02 -05:00
Vincent Lee cb31f06b69 Clean up gun model a bit 2019-08-24 12:27:57 -05:00
Vasco Lavos ef685eba7c Update contributors.properties 2019-08-22 16:48:22 +01:00
Hubry bd8ce05831 Various 1.14 work (#2955)
* Fix GoG islands appearing below world height

* Fix tallgrass being used instead of grass blocks

* Hook up flower worldgen again

* Fix index bookmark deserializ., remove debug, use nondeprecated method

* Backward compat for headflowers

* Sort recipes by input item order
2019-08-21 17:30:44 -05:00
Vasco Lavos d761cb9d9e Update contributors.properties 2019-08-20 23:27:44 +01:00
Vasco Lavos 845c201b10 Update contributors.properties 2019-08-18 23:34:58 +01:00
Vasco Lavos be98dd4023 Update contributors.properties 2019-08-16 08:42:14 +01:00
Vincent Lee 7003ba52ee bump forge 2019-08-15 20:12:55 -07:00
Vasco Lavos 45b075bf85 Update contributors.properties 2019-08-15 21:29:37 +01:00
Vincent Lee af740b634f Merge pull request #2951 from Hubry/mostly-lexicon
Make lexicon usable, search for recipes instead of hardcoding ids, and other
2019-08-09 16:04:14 -07:00
Hubry 290c69443d Make lexicon usable, search for recipes instead of hardcoding ids
Make dice of fate function again,
fix most remaining crafting recipes,
fix lexicon images
2019-08-09 23:10:11 +02:00
Vasco Lavos 9afecc1a5f Update contributors.properties 2019-08-08 04:24:53 +01:00
Vasco Lavos f6673e7ed1 Update contributors.properties 2019-08-06 02:04:49 +01:00
Vasco Lavos 1c099ea558 Update contributors.properties 2019-08-05 19:54:42 +01:00
Vasco Lavos 2675fef33a Update contributors.properties 2019-08-05 19:46:03 +01:00
Vasco Lavos c615f5e526 Update contributors.properties 2019-08-04 20:37:59 +01:00
Vincent Lee fb2cac4bf0 cleanups, add some vanilla tags 2019-08-04 10:45:33 -07:00
Vincent Lee f671faf20a delete unused versionchecker code 2019-08-04 09:54:00 -07:00
Vincent Lee 2f53768495 Merge branch '1.14' of github.com:Vazkii/Botania into 1.14 2019-08-04 09:46:34 -07:00
Vincent Lee df4d1f9826 Bump to 1.14.4 and fix compile 2019-08-04 09:46:04 -07:00
Vasco Lavos 5d2f404a77 Update contributors.properties 2019-07-28 20:09:08 +01:00
Vasco Lavos 614ab6a698 Update contributors.properties 2019-07-26 21:45:55 +01:00
Vasco Lavos f0112b127a Update contributors.properties 2019-07-26 16:22:16 +01:00
Vasco Lavos 5ae0657626 Update contributors.properties 2019-07-24 17:21:38 +01:00
Vasco Lavos 6ae937a5a6 Update contributors.properties 2019-07-23 13:28:00 +01:00
Vasco Lavos a546a38571 Update contributors.properties 2019-07-22 21:23:58 +01:00
Vincent Lee 2536d842db Merge pull request #2941 from Hubry/stuff
Convert items to objectholder, fix some i18n and missed recipes, etc.
2019-07-20 09:31:56 -07:00
Vincent Lee ea84b87c0d Sync recipes on reload (untested) 2019-07-17 20:56:51 -07:00
Vincent Lee e9c669034e misc fixes 2019-07-17 20:05:36 -07:00
Vincent Lee 0315863e6a Move rod of shaded mesa blacklist to entity tags 2019-07-17 19:59:06 -07:00
Vincent Lee e7f79f3336 Update forge, restore jei integration 2019-07-17 19:48:28 -07:00
Vasco Lavos 02b27076e8 Update contributors.properties 2019-07-16 12:17:58 +01:00
Vasco Lavos 42f135ecb9 Update contributors.properties 2019-07-08 18:18:52 +01:00
Hubry 99eb08a303 Convert items to objectholder, fix some i18n and missed recipes 2019-07-05 19:40:46 +02:00
Vincent Lee b0d875b3da Fix #2940 2019-07-04 12:19:20 -07:00
Vincent Lee b9980ffaac temporarily fix particles 2019-07-03 23:46:01 -07:00
Vincent Lee 9ade570e78 Fix texture stitching 2019-07-03 22:02:03 -07:00
Vincent Lee 55a2d42a29 Make recipes reloadable using an event. Eventually they may move to jsons/files, but this will do for now 2019-07-03 21:47:42 -07:00
Vincent Lee c4278be1ff couple todos 2019-07-01 22:09:05 -07:00
Vincent Lee c07d3d12bd Fix a couple recipes/loot tables 2019-07-01 21:53:54 -07:00
Vincent Lee 56320fce98 Move potion textures to vanilla atlas 2019-07-01 21:43:50 -07:00
Vincent Lee 9d46ff7fe0 Fix some crashes and things on wrong bus, add valid blocks to TETypes 2019-07-01 21:11:51 -07:00
Vincent Lee 633c3e7b4d Move jei integration out temporarily for compiling, update mods.toml 2019-07-01 20:37:48 -07:00
Vincent Lee 5304645972 Compiling 2019-07-01 20:27:37 -07:00
Vincent Lee 7cdc5c9ce0 Almost there 2019-07-01 00:31:06 -07:00
Vincent Lee 233ab271f7 another half 2019-06-30 15:49:33 -07:00
Vincent Lee 64d90dd502 Fix slab tables 2019-06-30 14:54:29 -07:00
Vincent Lee 2b7a780736 block loot tables 2019-06-30 14:51:22 -07:00
Vincent Lee 27ec1e58fc Below 300 errors 2019-06-30 13:34:45 -07:00
Vincent Lee d0acd5fdb0 Another pass 2019-06-29 22:55:04 -07:00
Vincent Lee fc1dd61c53 Another pass through 2019-06-29 14:54:39 -07:00
Vincent Lee bd5b395ee8 More work, pretty close to being back to 1.13 level 2019-06-29 00:28:18 -07:00
Vincent Lee 828d952a86 Fix most of entities 2019-06-27 22:36:46 -07:00
Vasco Lavos 0faad6c550 Update contributors.properties 2019-06-28 06:17:59 +01:00
Vincent Lee 207a66b121 more random fixes 2019-06-25 21:04:36 -07:00
Vasco Lavos 61f1489c4a Update contributors.properties 2019-06-26 03:38:00 +01:00
Vincent Lee e7dc900634 brief pass through trinkets 2019-06-24 19:51:18 -07:00
Vincent Lee 815e4f9e92 Rerun migration maps for curio change 2019-06-24 19:27:28 -07:00
Vincent Lee d6595872be Merge branch '1.13' into 1.14 2019-06-24 19:25:02 -07:00
Hubry 05c88fd62a Make handling of curios centralized and add handling for no curios (#2913)
Minor fixes to cosmetic bauble rendering (GL stack overflows),
include the missed belt in belt curios
2019-06-24 18:45:59 -07:00
Vasco Lavos 862279665e Update contributors.properties 2019-06-25 00:34:39 +01:00
Vasco Lavos 55c41933b2 Update contributors.properties 2019-06-23 00:40:27 +01:00
Vincent Lee 898e15a221 Misc fixes 2019-06-22 14:04:02 -07:00
Vincent Lee 0f8625adff Pass through subtiles 2019-06-22 00:11:23 -07:00
Vincent Lee 070093c9e5 Update forge, Replace spawn->addEntity, misc fixes in TE's 2019-06-21 23:43:52 -07:00
Vasco Lavos f7fb3a87e3 Update contributors.properties 2019-06-20 18:06:47 +01:00
Vasco Lavos e7dd751cec Update contributors.properties 2019-06-18 23:46:47 +01:00
Vasco Lavos 2759b0a078 Update contributors.properties 2019-06-11 18:18:56 +01:00
Vincent Lee cce2f81d15 Misc fixes around 2019-06-08 18:47:15 -07:00
Vincent Lee ee08a279a7 Fix some block methods 2019-06-08 18:08:15 -07:00
Vincent Lee c7cc76e1f3 openglhelper -> glx 2019-06-08 01:20:51 -07:00
Vincent Lee 0e3c5949a1 Remove blockfaceshape 2019-06-08 01:19:50 -07:00
Vincent Lee 7ef12b61d8 update gradle, apply migration mappings, start fixing stuff 2019-06-08 01:07:26 -07:00
Vasco Lavos bbd7cbb6fb Update contributors.properties 2019-06-06 05:57:28 +01:00
Danny 4d34149a53 Improved russian translation (#2903) 2019-06-02 12:46:07 -07:00
Hubry 2f3a1935cf 1.13 crafting recipe fixes (#2916)
* Fix incorrect item names, migrate data tags to flattened/nbt items

* Register fluxfield condition and shapeless mana upgrade

* Fix wrong JEI recipe catalyst, add corporea keybind JEI bookmark support
2019-06-02 12:44:22 -07:00
Vincent Lee 12695ae3f4 Fix dodge ring crash, fix logo 2019-06-02 12:44:22 -07:00
Vincent Lee ed3ef437d5 brace oops 2019-06-02 12:44:22 -07:00
Vincent Lee 0c1643fe45 eliminate some hard refs to curio api 2019-06-02 12:44:22 -07:00
Vincent Lee 1d4c65a7c4 More curio work 2019-06-02 12:44:22 -07:00
Vincent Lee 58ce052176 more curio stuff 2019-06-02 12:44:22 -07:00
Vincent Lee 5fbf520c1d more curios 2019-06-02 12:44:22 -07:00
Vincent Lee 3595f35e5b update forge and fix platforms, more curios 2019-06-02 12:44:22 -07:00
Vincent Lee 6ce466273c Experimental curios support 2019-06-02 12:44:22 -07:00
MelanX 1c499028f7 fixed lang files for most entries (#2912)
* fixed lang files for most entries

* fixed each lang key in the lang files

added a few keys for non existent (or not founded) items (e.g. Floating Pure Daisy...)

* removed slabFull entries

* added a lot of German translation + changed/deleted a bit more in each language
2019-06-02 12:41:49 -07:00
Hubry 843fa2fd06 Add hook for hidden lexicon categories (#2867) 2019-06-02 12:40:11 -07:00
Vincent Lee 4affec10a9 Fix typo sprectrolus -> spectrolus 2019-06-01 15:42:55 -07:00
Vincent Lee e8d1b61525 I'm in I'm in 2019-06-01 15:39:12 -07:00
Vasco Lavos d79f2fb073 Update contributors.properties 2019-06-01 21:53:23 +01:00
Vasco Lavos 514a3b0454 Update contributors.properties 2019-05-29 17:41:21 +01:00
Vasco Lavos 783b32518d Update contributors.properties 2019-05-27 22:20:10 +01:00
Vincent Lee 078fd054e0 Fix flugel tiara's secret code not working on linux 2019-05-15 13:03:06 -05:00
quaternary 71bc77e406 Allow break-blacklisted blocks inside the arena (#2908) 2019-05-10 17:57:10 -05:00
Vincent Lee 46546d2ecc Merge branch 'flattenall' into 1.13 2019-05-08 23:05:26 -05:00
Vincent Lee bf6dccfcd2 Beginning of work to flatten all special flowers. not compiling yet
more work. almost done.

Compiling and launching worlds

Fix models and other bugs

Cleanup ,fix flower langs and tooltips

remove old specialflower blockstate json
2019-05-08 23:04:53 -05:00
Vasco Lavos 2b0233f771 Update contributors.properties 2019-05-08 21:39:37 +01:00
Vincent Lee ab12adaf27 Move rest of mana infusion recipes to imc 2019-04-29 22:15:05 -05:00
comp500 7416d8e25a Check for PreventRemoteMovement NBT tag (#2888) 2019-04-29 21:53:59 -05:00
MoriyaShiine 6e6dc44a5e fix armor... again (#2898) 2019-04-29 21:53:22 -05:00
quaternary 63c364b020 Less strict gg arena floor checks, some changes to accomodate for low-floor fights, QoL improvements with messed up pylons (#2899) 2019-04-29 21:52:18 -05:00
Vasco Lavos 99b9779018 Update contributors.properties 2019-04-28 21:14:18 +01:00
Vincent Lee bd095808b7 Fix jei plugin not loading 2019-04-23 13:37:09 -05:00
Vincent Lee c34d2c55b9 Restore JEI integration, though it doesn't seem to load right now 2019-04-23 00:21:23 -05:00
Vincent Lee 57225fda6c Dedupe prefix impls 2019-04-22 20:02:08 -05:00
Vincent Lee 9d0c65fae0 Missing files 2019-04-22 20:01:23 -05:00
Vincent Lee 15c35ee8da Move mana infusion recipes to imc 2019-04-22 20:01:06 -05:00
quaternary 94ed40a955 Fix #2893. As it turns out, I am not smart (#2894) 2019-04-21 22:24:41 -05:00
Vincent Lee b971abdeb1 Fix magnet ring working in spectator mode, fixes #2890 2019-04-16 22:53:16 -05:00
Vincent Lee 48b52a9a86 Fix more recipes 2019-04-11 23:50:32 -05:00
David Vierra fdc957c87f When matching recipe tags, also match the first items of nested lists (#2881)
Mostly useful when adding CraftTweaker recipes which have Forestry bees
as inputs, since the bee's chromosomes are in a list and the recipe
only needs to match some of the chromosomes.
2019-04-11 20:38:49 -05:00
Vasco Lavos 4f6f712c67 build 2019-04-11 21:55:29 +01:00
Vincent Lee aed98aaded Snipe some todos 2019-04-10 21:41:23 -05:00
Vincent Lee 7db5f1fb61 Fix biome stone recipes 2019-04-10 21:13:30 -05:00
Vincent Lee 415de493d5 Fix more recipes 2019-04-07 17:23:58 -05:00
Vincent Lee f1a1b36c7e Convert all langs to jsons, remove all _comment lines except header 2019-04-07 16:47:09 -05:00
Vincent Lee 704a03e131 Conver en_us lang to json, start fixing it. This'll take forever. 2019-04-07 13:41:00 -05:00
Vincent Lee c1a306e765 Merge branch 'master' of github.com:Vazkii/Botania into 1.13 2019-04-07 13:01:36 -05:00
Vincent Lee c29640e558 Misc todo fixes in enchanter, tiny potato, avatar 2019-04-07 12:57:46 -05:00
John Hossler 62545d6b1e Update en_us.lang (#2876) 2019-04-07 12:08:52 -05:00
iPopstop 57fb8a7019 Update ru_ru.lang (#2793)
* Minor edits

[Important]: Format error(botania.armorset.*.desc) - fixed
botania.armorset.will*.desc - updated
botania.armorset.will*.shortDesc - updated
botaniamisc.requestMsg - updated
Added:
botania.nei.orechid, botania.nei.orechidIgnem

* New information

Updated(Minor edits):
# -- MANAWEAVE CLOTH
# -- ROD OF THE SHIFTING CRUST
# -- SLIME IN A BOTTLE
# -- FLORAL OBEDIENCE STICK
botania.entry.livingwoodBow
Added:
# -- HAND OF ENDER
# -- SOULSCRIBE
# -- LIFE IMBUER
# -- FLUGEL TIARA
# -- LIFE AGGREGATOR
# - BAUBLES
# -- AN INTRODUCTION TO BAUBLES
# -- TINY PLANET
# -- BAND OF MANA
# -- BAND OF AURA
# -- SOUJOURNER'S SASH
# -- TECTONIC GIRDLE
# -- SNOWFLAKE PENDANT
# -- PYROCLAST PENDANT
# -- RING OF CHORDATA
# -- RING OF THE MANTLE
# -- RING OF MAGNETIZATION
# -- RING OF FAR REACH
# -- CHARM OF THE DIVA
# -- GREAT FAIRY RING
# -- GLOBETROTTER'S SASH
# -- THE SPECTATOR
# -- CRIMSON PENDANT
# - ALFHOMANCY
# -- THE PORTAL TO ALFHEIM
# -- A MESSAGE FROM ELVEN GARDE
# -- THE RESOURCES OF ALFHEIM
# -- DECORATIVE BLOCKS
# -- DISPENSER TWEAKS
# -- GLIMMERING FLOWERS
# -- NATURAL SHEDDING
# -- AZULEJO
# -- STARFIELD CREATOR

* Settings + Ritual of Gaia

And 
# -- HEAD CREATION
# -- UNSTABLE CUBE

* Minor edit

Added:
# -- MANASEER MONOCLE
# -- BAUBLE CASE
# -- INVISIBILITY CLOAK
# -- CIRRUS AMULET
# -- NIMBUS AMULET
# -- THIRD EYE
# -- PLANESTRIDER'S SASH
# -- BENEVOLENT GODDESS' CHARM
# -- RING OF CORRECTION
# -- TRODDEN DIRT
# -- SHIMMERING MUSHROOMS
# -- PHANTOM INK
# -- STONE ALCHEMY
# -- BLAZE LIGHT
# -- PORTUGUESE PAVEMENT

* Update

* Minor fixes

Very minor fixes

* Minor update
2019-04-07 12:07:05 -05:00
Vincent Lee 5713b91177 Merge branch 'master' of github.com:Vazkii/Botania into 1.13 2019-04-07 11:58:17 -05:00
Vincent Lee f7b90dbba2 Add missing itemblocks for dreamwood variants 2019-04-07 11:47:08 -05:00
Vincent Lee 3509c9a3a6 Fix more models 2019-04-07 11:33:31 -05:00
Vincent Lee 32d75b8612 Fix lens rendering on gunmodel 2019-04-06 22:01:11 -05:00
Vincent Lee 3c71d46b82 Move a bunch of API calls to IMC, making them thread safe in the process 2019-04-06 21:27:17 -05:00
Vincent Lee b1b37b4c5a Move subtiles to a forge registry, very similar to TileEntityType 2019-04-06 19:49:37 -05:00
Vincent Lee ace224e41e Update forge, fix spreader placement and rendering weirdness 2019-04-06 15:50:34 -05:00
Vincent Lee 7351966073 Minor model typos 2019-04-05 02:12:28 -05:00
Vincent Lee b9041f5ceb Tweak more model stuff 2019-04-05 02:02:53 -05:00
Vincent Lee a0bd6ced48 Fix lexicon and gun models, partially. lenses still look a bit weird 2019-04-05 01:43:17 -05:00
Vincent Lee 32b0f64127 Remove old fix for vanilla particle bug 2019-04-04 23:21:30 -05:00
Vincent Lee 055f03d319 Fix a bunch of recipes and models 2019-04-02 22:38:22 -05:00
Vincent Lee 99469e1851 Fix a bunch of recipes 2019-04-02 12:16:56 -05:00
Vincent Lee 199612b17b Fix some todos 2019-04-02 11:39:47 -05:00
Vincent Lee 80170942e5 use forgeregistries instead of iregistry where possible 2019-04-02 01:15:36 -05:00
Vincent Lee ff975fbded Fix a bunch of todos and misc bugs 2019-04-02 01:09:21 -05:00
Vincent Lee 2e852ab24e Fix bellows rendering 2019-04-02 00:21:22 -05:00
Vincent Lee bb4bae1761 Fix crafty crate rendering, pattern now derived from blockstate instead of TE 2019-04-01 17:40:25 -05:00
Vincent Lee 2a27264b22 uhhhhhhh oops 2019-04-01 17:08:04 -05:00
Vincent Lee cb90228d10 Clean up force relays a bit 2019-04-01 16:47:06 -05:00
Vincent Lee 79bc21b525 Remove old script 2019-04-01 00:18:57 -05:00
Vincent Lee 99b2f61fc7 Fix almost all itemblock models 2019-04-01 00:18:33 -05:00
Vincent Lee 9173ebc5c4 Fix weird buildsystem bug 2019-03-27 23:02:07 -05:00
Vincent Lee d8715c47d9 Fix stiar and slab itemblock rendering 2019-03-27 23:01:16 -05:00
Vincent Lee 49d52b4a85 Fix #2875 2019-03-27 20:16:58 -05:00
Vincent Lee 1701732aac Fix improper usage of zero-sized stacks. Closes #2878 2019-03-27 20:13:44 -05:00
Vincent Lee 9685007e1d Oops 2019-03-26 23:26:14 -05:00
Vincent Lee 0f4afe4ca4 Fix all remaining stairs, some items 2019-03-26 23:25:39 -05:00
Vincent Lee 9e6a19218f Fix more blocks, fix shaders 2019-03-26 22:54:14 -05:00
Vincent Lee 34369a9bcc More block rendering 2019-03-26 21:32:15 -05:00
Vincent Lee fa983f1638 Fix a lot of stairs, make ender eye block particles clientside to reduce network traffic 2019-03-25 21:15:07 -05:00
Vasco Lavos 13598c3c0a Update contributors.properties 2019-03-25 17:17:53 +00:00
Vincent Lee f1288aba3a Fix glass panes 2019-03-23 22:36:33 -05:00
Vincent Lee 6a84e6b411 Fix animated torch item model, fancify apothecary bounding box 2019-03-22 18:04:36 -05:00
Vincent Lee 94b7b3fec8 Fix more blocks 2019-03-22 17:46:49 -05:00
Vincent Lee 0ad0ae4d14 Fix pool collision box, fix more block rendering 2019-03-22 00:39:24 -05:00
Vincent Lee b80f998688 Crash fixes, fix more blocks 2019-03-21 23:43:16 -05:00
Vincent Lee b022c8d693 Fix some itemblocks 2019-03-21 20:07:46 -05:00
Vincent Lee 5924a9362d Fix some block models 2019-03-21 18:08:12 -05:00
Vincent Lee c9184363fd Fix a bunch of item models 2019-03-21 17:38:08 -05:00
Vincent Lee e76559a3f7 Fix more recipes 2019-03-21 17:12:49 -05:00
Vincent Lee 878455b38e Fix some recipes 2019-03-21 17:02:07 -05:00
Vincent Lee a16a5aa984 Fix loot tables, and a fel pumpkin crash 2019-03-21 16:20:44 -05:00
Vincent Lee dfa6a6783e Fix advancements 2019-03-21 16:14:14 -05:00
Vincent Lee 33dc7033a9 It runs, kind of 2019-03-21 14:55:58 -05:00
Vincent Lee 03df0135cf Missing recipes 2019-03-21 14:46:01 -05:00
Vincent Lee 7c4797177d Tons of fixes to try to get things to load 2019-03-21 14:45:33 -05:00
Vincent Lee 8908871e7b Move stripper.exe because mc's trying to load it 2019-03-21 11:06:08 -05:00
Vincent Lee 62d6654c9a Move JEI integration temporarily cause I'm too lazy to comment this all out 2019-03-21 11:04:42 -05:00
Vincent Lee 6dc4c1d851 Move AT, move mcmod.info to mods.toml 2019-03-21 11:02:00 -05:00
Vincent Lee 9825900fe5 Fully compiling, but probably doesn't run yet 2019-03-20 23:58:24 -05:00
Vasco Lavos b570204471 Update contributors.properties 2019-03-19 20:31:15 +00:00
Vincent Lee ea50b40229 More work 2019-03-17 21:25:20 -05:00
Vincent Lee faeac4494c update forge 2019-03-17 13:22:06 -05:00
Vincent Lee 922eb9f741 update sky renderer 2019-03-17 11:40:03 -05:00
Vincent Lee 0377f68f84 Fix recipes + misc cleaning 2019-03-17 11:15:39 -05:00
Vincent Lee 04900e560d Getting close 2019-03-17 00:35:40 -05:00
Vincent Lee fbbb4e3c02 more cleaning 2019-03-15 00:50:15 -05:00
Vincent Lee 776d62dcbc more cleaning 2019-03-15 00:31:21 -05:00
Vincent Lee 37c64a1688 More cleaning 2019-03-14 23:54:32 -05:00
Vincent Lee db6da27ce1 Finish previous commit 2019-03-14 22:34:49 -05:00
Vincent Lee 24421d83dd wip - Move flower generation to Feature 2019-03-14 22:25:30 -05:00
Vincent Lee d0878c731b more cleaning 2019-03-14 00:54:29 -05:00
Vincent Lee 2acde8a867 Update config to new system. Remove adaptor for now. 2019-03-13 23:58:42 -05:00
Vincent Lee 2500e3a52e Remove shedding completely 2019-03-13 22:26:16 -05:00
Vincent Lee 5a8c0e6c24 Space out all block/item names and probably break a ton of stuff 2019-03-13 00:08:24 -05:00
Vincent Lee d159660115 More cleaning 2019-03-13 00:01:03 -05:00
Vincent Lee d6bd0c021b Oredict/tag cleanup 2019-03-12 19:28:17 -05:00
Vincent Lee 3a8be04fa7 more cleaning, fix commands and delete download command 2019-03-12 18:38:56 -05:00
Vincent Lee 884280f987 Comment out a ton of bauble stuff 2019-03-12 18:01:52 -05:00
Vasco Lavos e27d994458 Update contributors.properties 2019-03-09 12:56:53 +00:00
Vasco Lavos 7751661252 Update contributors.properties 2019-03-09 12:13:01 +00:00
Vincent Lee d55bc624fc even more cleaning 2019-03-09 00:23:33 -06:00
Vincent Lee d0118056f1 remove all tc interface impls in one commit, for easy restoration later 2019-03-09 00:10:30 -06:00
Vincent Lee c7913430a4 more misc cleaning, remove IModelRegister 2019-03-09 00:07:11 -06:00
Vincent Lee e7f953881e 'fix' rest of guis mostly 2019-03-08 23:53:52 -06:00
Vincent Lee bc2e44ae9a bunch of gui stuff 2019-03-08 15:14:30 -06:00
Vincent Lee 88bc2b736a Fix #2620 by syncing item ages to client 2019-03-07 22:26:14 -06:00
Vincent Lee f79c7ac302 Fix #2862 and clean up the code a bit too 2019-03-07 21:54:26 -06:00
Vincent Lee 324369c7a6 'fix' teisrs 2019-03-07 01:09:42 -06:00
Vincent Lee 35e2a9039c Fixes in the API 2019-03-07 00:31:40 -06:00
Vasco Lavos fac41a7817 Update contributors.properties 2019-03-06 22:04:22 +00:00
Vincent Lee 42f09fad22 start trying to clean up main mod class 2019-03-06 01:41:42 -06:00
Vincent Lee 472cd80183 Move most dynamic recipes to json 2019-03-06 01:30:23 -06:00
Vasco Lavos 38e681c667 Update contributors.properties 2019-03-05 07:14:14 +00:00
Vincent Lee dec7306816 Misc fixes, comment out/delete a bunch of integrations, fix some recipes 2019-03-05 00:32:07 -06:00
Vincent Lee c62e663f92 Remove albedo integration for now 2019-03-04 23:00:07 -06:00
Vasco Lavos 55722f14bd Update contributors.properties 2019-03-03 08:06:38 +00:00
Vincent Lee 13e56153a9 Merge 1.12 2019-03-01 14:03:38 -06:00
Vincent Lee 364cf37747 Minor fixes and cleanings 2019-03-01 13:40:36 -06:00
Vincent Lee 95fc132f9f Another pass through items/entities 2019-02-28 23:05:19 -06:00
Vasco Lavos 9fde29e047 Update contributors.properties 2019-02-28 20:27:05 +00:00
Vincent Lee 4ad7e675eb Another pass through TE's. Things looking pretty good. 2019-02-28 01:28:07 -06:00
Vincent Lee e1890a7aab Fix main itemblocks 2019-02-27 02:04:40 -06:00
Vincent Lee f2704a3d1b Decorative blocks done 2019-02-27 01:50:00 -06:00
Vincent Lee 5cc374eaaf A bunch of decorative blocks 2019-02-27 00:18:58 -06:00
Vincent Lee 11c98a7ab2 Fix gaia guardians riding vehicles, a regression since 1.9. Yay. Recloses #1476 2019-02-24 19:54:39 -06:00
Vincent Lee a5625750b7 some subtile/te work 2019-02-24 18:19:47 -06:00
Vincent Lee c79f9f7704 pass through entity renderers 2019-02-24 17:18:24 -06:00
Vincent Lee 8aefdf57ea pass through tesrs 2019-02-24 17:05:44 -06:00
Vincent Lee a4d76b9335 move stuff to datapacks 2019-02-23 23:04:48 -06:00
Vincent Lee e7d0315ce3 lots more items 2019-02-23 23:02:01 -06:00
Hubry 010bdfcb4a Add corporea crystal cube locking (#2855)
* Add corporea crystal cube locking, modeled after hovering hourglass

* Disable rendering of some things when the lexicon is held

It looked quite bad when the lexicon info rendered behind the
block's display

* Sync the hourglass when wand of the forest is dispensed
2019-02-22 00:51:00 -06:00
quaternary a559131772 Gaia fixes and anticheese stuff (#2853)
* No sleeping through the fight!

* Far stricter arena check

* Some cleanups

* Change the way GG teleportation works + happier to break blocks

* Simplify teleportation logic.
  * Basically just picks a point somewhere in the arena and goes there.
  * Doesn't take collision boxes etc into consideration.
  * This fixes the "double carpet" exploit.
* GG is now super happy to break blocks.
  * Will break blocks in the path of a teleport.
  * Will break blocks around it every tick.
  * A new API method is added to add immune blocks (such as the pylons).

* Fix #2824 by always spawning traps at the arena height

* Fix regression where the gg considered players in spec mode

* Fix landmines better

* Fix block break position lol
2019-02-22 00:48:03 -06:00
Vincent Lee e7b5cfd02e Merge pull request #2859 from Hubry/intercepted-count
Fix corporea interceptor causing wrong count on index requests
2019-02-22 00:37:56 -06:00
Hubry c1841ff5dd Fix corporea interceptor causing wrong count on index requests
If the interceptor triggered a funnel making a request on the same
network it would've overwritten the request counts with last funnel's
2019-02-21 12:59:03 +01:00
Vincent Lee cb2b082ef1 Armor and some other items 2019-02-21 01:42:44 -06:00
Vincent Lee 548898275e Lots of work on tools 2019-02-21 01:04:23 -06:00
Vincent Lee 404f18604b Fix placeholders being overwritten by crafty crate. Closes #2858 2019-02-20 23:15:15 -06:00
Vincent Lee ffbdb87749 Merge pull request #2857 from zabi94/master
Use available baubles API methods when checking for rings instead of custom made ones
2019-02-19 18:58:31 -06:00
Vasco Lavos 5e7a55ed58 build 2019-02-19 20:24:38 +00:00
ZaBi94 5b0521382c Get worn ring with method provided by baubles API
Allows compatibility with Bring Me The Rings
2019-02-19 20:16:36 +01:00
Vincent Lee 56e12c7dfd Grind through a bunch of items. This is going to take a while 2019-02-16 22:49:49 -06:00
Vincent Lee 9cda2d5e87 Book fixes + other random fixes 2019-02-16 20:43:09 -06:00
Vincent Lee efc5d5c2ee Update to 1.13.2 2019-02-15 20:27:53 -06:00
Vincent Lee 605134a9c0 Merge pull request #2847 from quat1024/fixvineballs
Fix vine balls placing budded/invalid vines. Closes #2819
2019-02-13 13:36:22 -06:00
Vincent Lee e51e437c88 Merge pull request #2849 from quat1024/petalblock
Fix crafting petal blocks out of mushrooms
2019-02-13 13:36:15 -06:00
Vincent Lee 8e3817b8c4 Merge pull request #2848 from quat1024/specialpumpkins
Some stuff involving special grasses
2019-02-12 21:48:26 -06:00
Vincent Lee 6cdde7a825 Merge pull request #2851 from Hubry/static-flowers
Fix static model floating flowers crashing on moving with Quark's pistons, fix pasture seed effects not showing immediately
2019-02-12 21:47:49 -06:00
Hubry 2986240b74 Fix static model flowers not showing pasture seed effects on apply 2019-02-12 20:13:28 +01:00
Hubry 9df180a6a1 Fix crash on moving static model floating flowers with Quark TE pistons 2019-02-12 20:12:27 +01:00
quat f33a5675ad Fix crafting petal blocks out of mushrooms 2019-02-12 02:16:08 -05:00
quat 666ed3f6ac You can now use your mother on special grasses 2019-02-12 01:57:30 -05:00
quat c5a874d4ea Pumpkins and melons can grow on special grass 2019-02-12 01:34:29 -05:00
Vincent Lee d357279ca4 Merge pull request #2845 from quat1024/nbt_fix_uwu
Change how NBT matching works, now it's faster and works better with nested tags
2019-02-12 00:12:37 -06:00
quat b40a99bd9c Fix vine balls placing budded/invalid vines. Closes #2819 2019-02-12 01:12:25 -05:00
Vincent Lee 2bd6c4be00 Merge pull request #2846 from quat1024/flipperhock
Flip hopperhock inventory sidedness
2019-02-12 00:11:44 -06:00
quat 16a02f59f8 Flip hopperhocks 2019-02-12 00:53:47 -05:00
quat cd558910d9 Change how NBT matching works, now it's faster and works better with nested tags 2019-02-12 00:30:02 -05:00
Vincent Lee 22a0c2026f packets 2019-02-10 20:49:20 -06:00
Vincent Lee a219aad6ee More blocks 2019-02-10 20:33:22 -06:00
Vincent Lee 5f736bbe99 Make registration a bit less repetitive 2019-02-10 20:18:38 -06:00
Vincent Lee 1b28cbe57f Some shotgun renames I should've done a long time ago 2019-02-10 20:13:14 -06:00
Vincent Lee 3227e1b591 Even more blocks 2019-02-10 20:11:56 -06:00
Vincent Lee 70c5e51df4 Even more blocks, getting close now 2019-02-09 22:49:26 -06:00
Vincent Lee f577479e30 Even more blocks 2019-02-09 21:47:05 -06:00
Vincent Lee 0a9a3aa9a6 Flatten more blocks 2019-02-08 01:35:11 -06:00
Vincent Lee ea41348ded Begin block flattening. First victims: livingwood and livingrock 2019-02-06 16:38:52 -06:00
Vincent Lee a9e1615ab6 Big pass through render stuff 2019-02-06 01:40:20 -06:00
Vincent Lee 092442f44a Some client stuff 2019-02-06 00:21:12 -06:00
Vincent Lee 0996ffbcca Minor tweaks, full replace sideonly/side with onlyin/dist 2019-02-05 23:58:58 -06:00
Vincent Lee f84e09eda3 Fix cloaks blocking admin-damage like /kill 2019-02-05 23:44:01 -06:00
Vincent Lee 5bf8fbcca6 A pass through TEs 2019-02-05 00:40:10 -06:00
Vincent Lee 1624603715 A pass through functional flowers 2019-02-05 00:02:43 -06:00
Vincent Lee 1feadf2835 Fix #2841 2019-02-04 14:16:48 -06:00
Vasco Lavos 164fe6b45e buildy 2019-02-04 17:57:12 +00:00
Vincent Lee f5b972b4c1 some blocks, dispenser behaviors, pass through generating flowers 2019-02-03 23:57:12 -06:00
Vincent Lee f8313ad928 pass through entities 2019-02-03 21:11:05 -06:00
Vincent Lee cc7d00f578 Some helpers, advancements, potions 2019-02-03 19:45:24 -06:00
Vasco Lavos 3ffd9aed49 Update ItemItemFinder.java 2019-02-03 13:59:43 +00:00
Vasco Lavos 47ce2fd12b Update contributors.properties 2019-02-03 12:45:51 +00:00
Vincent Lee 6f20d51b04 A bunch of items 2019-02-03 01:14:01 -06:00
Vincent Lee 5c3ac18670 Easy registry fixes 2019-02-02 23:27:00 -06:00
Vincent Lee 075bac61d3 Update gradle to 1.13, hack build.gradle enough so it lets me decompile 2019-02-02 20:20:59 -06:00
Vincent Lee cae9a83ddf Fall through when enchanter creation fails. Closes #2840 2019-02-02 16:26:56 -06:00
Vincent Lee 464fe133c7 Fix redstring spoofer not affecting vinculotus, closes #2835 2019-02-02 01:25:39 -06:00
Vincent Lee 7577ac8511 Fix #2836 2019-02-01 16:43:16 -06:00
Vincent Lee d0f017f7c6 Merge pull request #2839 from Hubry/jei-tweaks
Clean up JEI plugin warnings, formatting, add wrappers for a few recipe types
2019-02-01 16:32:32 -06:00
Vincent Lee 25cfc07349 Fix mana prism automation changes not causing spreaders to recalculate, closes #2837 2019-02-01 16:28:15 -06:00
Hubry f41de4afe4 Clean up JEI plugin warnings, add wrappers for a few recipe types 2019-02-01 22:42:57 +01:00
Hubry cff5edcd21 Make magnet ring respect pickup delays and tweak blacklist (#2799)
* Items with pickup delay >40 ticks will be ignored
* Ignore AE2 seeds with their changed name
* Make the blacklist actually usable and not crash when added to with IMC
2019-02-01 16:44:00 +00:00
Vasco Lavos b9e169fff1 Update contributors.properties 2019-01-29 11:58:51 +00:00
Vincent Lee e47734e534 Remove datafixers, forward compat to 1.13 is RIP anyway 2019-01-23 19:08:40 -06:00
Vincent Lee e093eedba3 Fix compile errors 2019-01-23 19:06:33 -06:00
Vasco Lavos 047e572ed1 Update contributors.properties 2019-01-21 13:43:25 +00:00
Vincent Lee 922dd075d2 Merge pull request #2797 from Hubry/rotating-items-fix
Fix Lexica rotating item config not swapping usable items in recipes
2019-01-18 11:31:48 -06:00
Vincent Lee 2785622dfa Merge pull request #2800 from Hubry/red-string-container
Give the red string container a dummy item handler when not bound
2019-01-18 11:24:26 -06:00
Vincent Lee eaaa55fdb0 Merge master 2019-01-16 14:46:30 -06:00
Vincent Lee 3e4b6a818c Fix #2827 2019-01-16 12:00:29 -06:00
Vincent Lee c019ba3864 Merge pull request #2826 from tcheinen/master
fix #2825 (manasteel and elementium shears drop apples and saplings)
2019-01-15 22:25:56 -06:00
Teddy Heinen c1f6c1c5be fix #2825 (manasteel and elementium shears drop apples and saplings) 2019-01-15 20:36:38 -06:00
Vasco Lavos cc4b05f31f Update contributors.properties 2019-01-15 22:53:23 +00:00
Vasco Lavos 024ea95c8c Update contributors.properties 2019-01-14 21:04:29 +00:00
Vasco Lavos 7cdb5b747a Update contributors.properties 2019-01-10 01:14:14 +00:00
Vasco Lavos 7b5daf0b64 Update contributors.properties 2019-01-09 00:01:21 +00:00
Vasco Lavos 0c0700f3e8 Update contributors.properties 2019-01-08 21:52:42 +00:00
Vincent Lee 01d1e9df4b Fix #2822 2019-01-07 16:54:46 -06:00
Vincent Lee f7eb9422e6 Make Diva Charm/Heisei Dream less janky, and fix diva charm particles not being visible. Closes #2820 2019-01-07 16:39:48 -06:00
Vasco Lavos 32b5658c25 Update contributors.properties 2019-01-05 20:58:30 +00:00
Vincent Lee 81970e1833 Merge pull request #2816 from trunksbomb/master
Update en_us.lang
2019-01-05 00:47:43 -06:00
trunksbomb 899c39c523 Remove accidental line duplication
Signed-off-by: trunksbomb <trunskbomb@msn.com>
2019-01-03 20:12:39 -05:00
Vincent Lee 27ec538ea1 Merge pull request #2818 from Hubry/gradle
Cleanup buildscript, add api jar, update gradle
2019-01-03 11:38:33 -06:00
Hubry d4c6b6629c Simplify buildscript, add api jar, update gradle
Gradle updated to 4.9.
Replaced the weird gradle stuff with a thing taken from Patchouli
Removed the forgecraft task with that, it wasn't used anymore anyways
Added an api jar containing api classes + source
Replacing deprecated << uses with doLast, minor styling tweaks
2019-01-03 16:29:47 +01:00
trunksbomb 174afe0c6d Fixed some typos in en_us.lang, left "flavor text" alone for the most part
Signed-off-by: trunksbomb <trunskbomb@msn.com>
2019-01-01 22:55:58 -05:00
Vasco Lavos 5b5108c43c Update contributors.properties 2019-01-02 03:48:20 +00:00
Vasco Lavos 4d82f65766 Update contributors.properties 2018-12-31 03:44:22 +00:00
Vasco Lavos 13f8e6d02c Update contributors.properties 2018-12-29 02:19:44 +00:00
Vasco Lavos 921e63e814 Update contributors.properties 2018-12-27 17:30:29 +00:00
Vincent Lee 9e8dcbd51b Fix #2694 by imposing a limit of 256 blocks (16 chunks view distance) 2018-12-25 22:49:13 -06:00
Vincent Lee daff8ece87 Fix spell cloth duplication glitch #2810 2018-12-25 22:23:16 -06:00
Vincent Lee 43734ee338 Revert "Fix sparks/corporea sparks blocking arrows and digging"
Doing this prevents the wand from targeting it too...
This reverts commit 5393a5202a.
2018-12-25 22:15:27 -06:00
Vincent Lee fb8ebd8ca7 Update forge/mappings/thaumcraft 2018-12-25 22:02:04 -06:00
Vincent Lee 5393a5202a Fix sparks/corporea sparks blocking arrows and digging 2018-12-20 15:29:08 -06:00
Vasco Lavos 11ea3f9ee6 Update contributors.properties 2018-12-17 22:35:11 +00:00
Vasco Lavos cff18771a5 Update contributors.properties 2018-12-14 20:25:09 +00:00
Vincent Lee 136696d9d7 Fix #2803 2018-12-13 17:43:53 -06:00
Vasco Lavos 642e5fecf2 Update contributors.properties 2018-12-11 16:58:33 +00:00
Vasco Lavos e26e11fabb Update contributors.properties 2018-12-08 23:43:38 +00:00
Hubry 718f266521 Give the red string container a dummy item handler when not bound
Fixes #2790
2018-12-03 21:45:19 +01:00
Vasco Lavos b6d9e40f90 Update contributors.properties 2018-12-03 20:02:56 +00:00
Vincent Lee c80a3400e6 Merge pull request #2798 from Hubry/redirect-phantom
Fix redirection lenses having phantom lens functionality as well
2018-12-03 01:44:52 -06:00
Hubry 2226055872 Fix redirection lenses having phantom lens functionality as well 2018-12-02 21:21:08 +01:00
Hubry b8161d00cf Fix Lexica rotating item config not swapping usable items in recipes 2018-12-02 20:51:17 +01:00
Vincent Lee 4e4d6dffb9 Merge pull request #2796 from quat1024/apothecary_oops
Fix #2795 by tagging spawned apothecary item entities
2018-12-02 11:20:24 -06:00
quat 62a87277d4 Fix #2795 by tagging spawned apothecary item entities 2018-12-02 04:56:56 -05:00
Vasco Lavos 8d38659cbc Update contributors.properties 2018-12-02 03:16:55 +00:00
Vasco Lavos da1e25ed60 Update contributors.properties 2018-11-30 12:07:42 +00:00
Vasco Lavos 3ed41129a7 build 2018-11-30 05:14:49 +00:00
Vasco Lavos 9c6a5181ad Update package-info.java 2018-11-30 05:08:04 +00:00
quaternary 6a1ee4afca Tentative mana spreader path tracing optimizations (#2788)
* Tentative mana burst optimizations

* Add configuration option for spreader trace time

* One more easy optimization

* oops lang
2018-11-30 04:54:29 +00:00
Vasco Lavos 74d569615d Update contributors.properties 2018-11-30 04:44:59 +00:00
Vasco Lavos 8f6f7b5438 Fixed #2792 2018-11-30 04:37:21 +00:00
Hubry d0575240e6 Add offline mode config option and localize all config options (#2780) 2018-11-30 04:35:05 +00:00
iPopstop 6fb62b8d85 Update ru_ru.lang (#2783)
* Update ru_ru.lang

Minor grammar fixes

* Update ru_ru.lang

A lot of changes to make the translation more correct.
___
P.S. It's not over yet :d

* Minor fixes
2018-11-30 04:34:53 +00:00
quaternary 531912e726 Some botania tweaks stuff (on discord) (#2791)
* Taste the rainbow

* Gunpowder to flint = flint to gunpowder

* Allow whatever in the Petal Apothecary, remove canFit in IFlowerComponent

* NBT aware apothecary altar stuff
2018-11-30 04:33:43 +00:00
Vincent Lee 8f716c98f0 Consistentify whether GoG behaviours are enabled by a skyblock world or the GoG jar (all gameplay now only checks for the presence of the jar). Closes #2754 2018-11-28 23:57:54 -06:00
Vasco Lavos 40a959fde1 Update contributors.properties 2018-11-29 01:12:50 +00:00
Vincent Lee 968a3b4742 Merge pull request #2768 from Hubry/tc-integration
Tweaks to Thaumcraft integration
2018-11-26 12:07:01 -06:00
Hubry e5d457dc3b Tweaks to Thaumcraft integration
* Move TC brew recipes to init, postinit was too late for aspects
* Add brew aspects
* Replace wood and stone stacks with their aspects, avoids livingwood having just Victus
* Reduce the amount of wildcard metadata, it is not best practice when it can be avoided
* Tweak a few aspect lists
* Remove entities that are just entity form of items
* Add missed Spectrolus aspects
2018-11-26 10:49:56 +01:00
Vincent Lee b3b18b90e6 Merge pull request #2762 from Hubry/aggregator-tooltip
Fix Life Aggregator tooltip being always "entity..name"
2018-11-25 23:23:53 -06:00
Vincent Lee a84397a9fe Fix some deprecation warnings 2018-11-25 23:19:36 -06:00
Vincent Lee e9ba8392d0 Fix #2784 2018-11-25 23:02:33 -06:00
Vasco Lavos ab93acfc34 Update contributors.properties 2018-11-21 20:17:58 +00:00
Vincent Lee 68c24519b3 Merge pull request #2781 from Hubry/horses
Fix horse viruses replacing attributes and turning horses into babies
2018-11-19 20:57:31 -06:00
Vincent Lee 0aff10acfe Merge pull request #2782 from Hubry/cnb-imc
Fix Botania glass blocks being unchiselable with Chisels and Bits
2018-11-19 20:56:27 -06:00
Hubry 16bd2483f6 Fix Botania glass blocks being unchiselable with Chisels and Bits 2018-11-19 23:50:29 +01:00
Hubry 07c50a68d2 Fix horse viruses replacing attributes and turning horses into babies 2018-11-19 23:06:03 +01:00
Vasco Lavos 83bbf64acb buildy 2018-10-24 00:58:41 +01:00
Vincent Lee 642e300aa1 Merge pull request #2766 from Hubry/manifest-fix
Attempt to fix ATs in jar manifest, and add sources jar
2018-10-15 12:13:07 -05:00
Hubry 7d8ddb4d6f Try to fix #2536 and add sources jar 2018-10-15 16:15:18 +02:00
Vincent Lee 3bebde687e Fix #2764 2018-10-13 02:14:51 -05:00
Hubry 7dcaf2599a Fix Life Aggregator tooltip being always "entity..name" 2018-10-11 12:51:19 +02:00
Vincent Lee 9eae466d30 Cleanup in ToolCommons, fix a stack null in bow 2018-10-09 00:47:51 -05:00
Vincent Lee c402bd01b6 Merge pull request #2755 from Hubry/jei-corporea-recipe
Add JEI recipe gui support for the corporea request key
2018-10-08 23:46:02 -05:00
Vincent Lee 476bed4555 Merge pull request #2758 from Zhiyu-Yang/master
Update zh_cn.lang
2018-10-07 22:24:35 -05:00
Zhiyu Yang 07f3f7cef5 Update zh_cn.lang 2018-10-08 00:22:43 +08:00
Hubry 3f47c4866c Add JEI recipe gui support for the corporea request key
Bumps required JEI version to 4.13.1.220, which added the required hook.
2018-10-03 12:37:34 +02:00
Vincent Lee 5442b97f18 Merge pull request #2751 from SaurabhTotey/master
Added null-check to PlatformModel for #2684
2018-10-01 18:12:48 -05:00
Saurabh Totey 46713ef180 Added null-check to PlatformModel for #2684 2018-10-01 13:46:11 -06:00
Vincent Lee bd2c468ba4 Safety checks to fix #2727 2018-09-25 10:39:24 -05:00
Vincent Lee d10df52b92 Merge pull request #2745 from Hubry/jei-brews
Improve handling of brews in JEI
2018-09-17 17:11:14 -05:00
Hubry 3bf7e07546 Improve handling of brews in JEI
* Add subtype interpreters to make looking up specific brew recipes less annoying
* Add blood pendants and incense sticks to the brew recipe wrapper
* Add locking of the other ingredient, so that when an item is focused, the other ingredient does not change to the items that don't fit
  (eg. you looked up the flask of fleetfeet, the input no longer swaps between vials and flasks)
2018-09-17 13:06:46 +02:00
Vincent Lee 25d37b9c0c Merge pull request #2741 from codewarrior0/metastone-weight-lens
Allow Metamorphic Stones to be silk-dropped by a Weight Lens
2018-09-15 12:23:00 -05:00
Vincent Lee 871463ea3f Merge pull request #2739 from codewarrior0/patch-5
Prevent Fallen Kanade from healing during GG fights
2018-09-15 12:22:39 -05:00
David Vierra 41332fd106 Allow Metamorphic Stones to be silk-dropped by a Weight Lens 2018-09-14 21:50:54 -10:00
Vincent Lee f7e9b4cb99 Force relays now give visual feedback when binding them 2018-09-14 21:31:33 -05:00
David Vierra 492e101acd Prevent Fallen Kanade from healing during GG fights 2018-09-14 01:15:31 -10:00
Vincent Lee 80aea6f7be Remove more redundant stack copying from recipe matching 2018-09-09 18:23:09 -05:00
Vasco Lavos ead59192e6 Update contributors.properties 2018-09-07 21:41:37 +01:00
Vincent Lee 33f0880e88 Merge pull request #2733 from codewarrior0/tiny-potato-epitaph
Fix Tiny Potato equipment not syncing to clients
2018-09-05 00:03:34 -05:00
David Vierra a7e4a9e009 Fix Tiny Potato equipment not syncing to clients 2018-09-04 13:22:18 -10:00
Vincent Lee 27cb04cbbb Similar fixes to last commit, for grass horn and exchange rod 2018-09-03 20:26:20 -05:00
Vincent Lee 3154b8aa80 Fix bore lens not respecting harvest drops event. Closes #2730 2018-09-03 20:21:15 -05:00
Vincent Lee c70f53ceee Restore buildcraft integration (yay) 2018-09-03 15:25:25 -05:00
Vincent Lee 7dc0bd4670 Add some profiling for subtiles 2018-09-02 22:39:47 -05:00
Vincent Lee 8595d27f41 Eliminate lots of itemstack copying in pure daisy recipe matching. Should give enough of a lag improvement until 1.13 gets here :P 2018-09-02 22:21:21 -05:00
Vincent Lee 0b526c1b31 Fix withdrawing from brewery taking two items at a time 2018-09-02 21:33:15 -05:00
Vasco Lavos a144f4fb29 build 2018-09-01 14:03:14 +01:00
Hubry ff834dc823 Fix the portal not returning the lexicon. (#2726)
I swear I am competent.
2018-09-01 13:40:07 +01:00
Vasco Lavos 9653771d5a Update contributors.properties 2018-09-01 00:43:36 +01:00
Vincent Lee 651b17a9e6 Fix #2724 2018-08-29 14:04:50 -05:00
Vasco Lavos 0df5f64210 Comment out this old system that isn't being used anymore 2018-08-27 22:30:25 +01:00
Vasco Lavos 13e3ab2aae Build 2018-08-27 22:20:34 +01:00
Vasco Lavos 5e3a98fa1f Merge branch 'master' of https://github.com/Vazkii/Botania 2018-08-27 22:02:02 +01:00
Vasco Lavos 06dbf2a00a Let's pretend I didn't forget 90 :^) 2018-08-27 22:01:49 +01:00
Hubry c88555a24b Fix Alfheim portal storing items not used in recipes (#2721)
* Fix #2403 (Alfheim portal storing items not used in recipes)

Possibly mitigates #2669, as recipe checks are a bit simplified to not
create stack copies posting capability events and the portal will not
check items with no uses more than once.

* Don't teleport bread, Bord.
2018-08-27 21:30:47 +01:00
David Vierra 416738e991 Resize and reorient Tiny Potatoes held as equipment by other Tiny Potatoes (#2722)
Also adjusts the placement of any blocks on the top side of the potato
such that they rest flatly on the potato's head.
2018-08-27 21:30:27 +01:00
Vasco Lavos 5ee129b6cd Update contributors.properties 2018-08-27 14:16:35 +01:00
Hubry 18ab523c91 Fix #2718 (Crafting/Manufactory Halos crashing with active Thaumatorium) (#2720) 2018-08-27 14:10:41 +01:00
Vasco Lavos 4844c5009b Update contributors.properties 2018-08-27 14:07:02 +01:00
codycoolwaffle 484465a418 Close #2441 (#2458)
Adjusts night vision effect times to accommodate for lag to reduce flashing skies.
2018-08-27 12:11:42 +01:00
The_Fireplace 53841ec4d2 Added en_ud.lang (#2561) 2018-08-27 12:11:36 +01:00
Prosta4okua e0e8f9cf89 Update ru_ru.lang[Work in progress] (#2604)
* Update ru_ru.lang[Work in progress]

Can be closed https://github.com/Vazkii/Botania/pull/2539?

* Update ru_ru.lang

* Update ru_ru.lang

* Update ru_ru.lang

* Update ru_ru.lang

* Update ru_ru.lang

* Update ru_ru.lang

25%

* Update ru_ru.lang

* Update ru_ru.lang

* Update ru_ru.lang
2018-08-27 12:09:13 +01:00
Vasco Lavos 6f57b1bb11 Merge pull request #2679 from quat1024/reallyMakesUThink2ElectricBoogaloo
Fix positioning of the thinking hand when you put it on a tiny potato
2018-08-27 12:08:57 +01:00
Vasco Lavos 8e15883a60 Merge pull request #2691 from quat1024/eventsAndExtents
Add some events and make things a bit more extensible
2018-08-27 12:08:47 +01:00
Vasco Lavos a71507550a Merge pull request #2692 from quat1024/nice
Nice
2018-08-27 12:08:08 +01:00
Vasco Lavos bd6cb63300 Merge pull request #2701 from Hubry/creator-modid
Implement getCreatorModId on the flower item
2018-08-27 12:08:01 +01:00
Vasco Lavos e3c4d9895e Merge pull request #2702 from quat1024/retainerComparator2
Corporea retainers use richer signal strength depending on request size (but better)
2018-08-27 12:07:05 +01:00
Vasco Lavos e29c64dda2 Merge pull request #2713 from codewarrior0/patch-4
Add missing null check in PacketBotaniaEffect
2018-08-27 12:06:58 +01:00
Vasco Lavos f3155c74d2 Merge pull request #2716 from Hubry/more-cocoon-animals
Add llamas and parrots to the cocoon's rare animal spawns
2018-08-27 12:06:22 +01:00
Hubry 94721a0149 Add llamas and parrots to the cocoon's rare animal spawns
Llamas were added in 1.11, while parrots were added in 1.12.
Both of them are an exotic pet and so should be available from
the cocoon.
2018-08-26 23:52:13 +02:00
David Vierra 2c72e73d9e Add missing null check in PacketBotaniaEffect 2018-08-25 01:18:27 -10:00
Vincent Lee c3a7cc5c27 Fix #2710 2018-08-23 23:54:24 -05:00
Vincent Lee 99e8d6a70c Fix gg not responding to /kill 2018-08-22 12:15:13 -05:00
Vincent Lee c177cda9e2 Gaia guardian music now repeats, closes #2485 2018-08-22 12:15:13 -05:00
Vincent Lee 280ffe2f58 gg uses iextraspawndata instead of datawatcher for some fields 2018-08-22 12:15:13 -05:00
Vincent Lee de905a4bd1 Merge pull request #2708 from matthijsvdmeulen/master
Removed Railcraft support for the Mana Pool with Minecart.
2018-08-21 12:46:05 -05:00
Vincent Lee ae572867af Merge pull request #2707 from Hubry/oredict
Use ore dictionary ingredients in more recipes
2018-08-21 12:45:05 -05:00
Matthijs van der Meulen 49638c0aa6 Removed Railcraft support for the Mana Pool with Minecart.
As the Railcraft API for 1.12.2 is highly unstable, and crashes with the current version of Botania installed, I removed the implementation of IMinecartItem and all corresponding methods. The Mana Pool with Minecart still functions fine with railcraft, but now it doesn't crash anymore
2018-08-21 19:27:28 +02:00
Hubry f6c5b10962 Use ore dictionary ingredients in more recipes 2018-08-21 19:09:49 +02:00
Hubry 8e2b09527a Update TC integration to beta 21, small tweaks to aspects (#2693)
* Formatting fixes for my previous PRs

* Bump Forge, JEI and Thaumcraft and specify some of them in mod deps

Forge to latest recommended (TC requires it)
Thaumcraft to Beta 21 (the new aspect registration)
JEI to stable 4.10.0.198 (mostly for testing purposes like Thaumic JEI)

* Move to the aspect event and tweak some item aspects
2018-08-18 14:03:25 -05:00
quat 57cec38136 Use fancy log2 2018-08-16 22:12:07 -04:00
quat 84967e4e2e Revert inventory wrap hook
This reverts commit a122253791.
2018-08-16 00:44:38 -04:00
quat 11d4926ed8 don't update comparator output level unless it actually changed 2018-08-16 00:40:31 -04:00
quat 81f33e8d74 Corporea retainers use richer signal strength depending on request size 2018-08-16 00:27:29 -04:00
Hubry 04cbee8ae7 Implement getCreatorModId on the flower item
Replaces the tooltip containing the creator mod's modid with an override
for the method returning it, allowing mods like JEI to show the mod
that actually added the flower and return it in mod searches, like
Forge's universal bucket already does with mod fluids.
2018-08-15 23:02:38 +02:00
Vasco Lavos 3c6794e722 Update contributors.properties 2018-08-12 02:32:39 +01:00
quat 66aa3bf6b4 nice 2018-08-03 14:31:20 -04:00
quat fae9bcca75 Make wrappediinventory a bit more subclass friendly 2018-08-03 12:58:00 -04:00
quat 61e72f3cc3 Meh just use a field 2018-08-03 01:25:50 -04:00
quat 0eaab9a52c Add cancellable CorporeaIndexRequestEvent 2018-08-03 01:25:06 -04:00
quat bbbfac82f3 De-privatize WrappedIInventory for extension 2018-08-03 01:00:44 -04:00
quat a122253791 Add an inventory wrap hook 2018-08-03 00:59:55 -04:00
quat bfeff64bcb Fix positioning of the thinking hand when you put it on a tiny potato 2018-07-20 00:03:25 -04:00
Vasco Lavos 15f71c8a53 Merge pull request #2678 from quat1024/reallyMakesUThink
Add "Thinking Hand" cosmetic bauble
2018-07-20 04:36:41 +01:00
quat 5e7c963017 (unrelated) Fix Googly Eyes rendering inside the player's head 2018-07-19 23:11:51 -04:00
quat b9d2d78a80 Add lexicon page for the thinking hand 2018-07-19 23:07:41 -04:00
quat 1afb719782 add Thinking Hand cosmetic bauble 🤔 2018-07-19 22:54:03 -04:00
Hubry 73a1055b65 Reintroduce corporea index requesting from inventory/JEI item panel. (#2668)
* Reintroduce corporea index requesting from item panel.

This was removed in 08550cc442, during
the move from NEI to JEI. Rewritten to use JEI instead of NEI.

* Make this feature not depend on JEI to function, redo key checking

Instead, the JEI plugin will set a dummy supplier in the corporea handler to a proper one pulling from the item panel.
In addition, keyboard checks now use Keyboard's triggers instead.
2018-07-13 08:25:34 -07:00
Hubry 58346ad107 Update Thaumcraft integration (#2667)
* Pull TC6 from Curseforge's maven thing, remove API classes from repo

* Update Thaumcraft integration

* Make upgrade recipes move attached Thaumcraft item data properly
* Fix full mana inkwells pulled from creative menu not working
* Blacklist flux rifts instead of (removed) aura nodes from gravity rod
* Clean up a few TODOs around Thaumcraft integration
* Finally, assign Thaumcraft aspects to Botania items

* Add config for aspects.

Just in case of some bugs in Thaumcraft, or for modpack makers who want
to customize, so they don't have to disable everything by hand.
2018-07-12 22:58:16 -07:00
Hubry 5841466efa Clean up and update wiki providers. (#2666)
Lowercase modids, remove providers for defunct sites and mods with
no chance to come back, use HTTPS for Gamepedia, update URLS to sites
that moved.
2018-07-03 20:17:03 -07:00
Vincent Lee 7347d6df5c Fix #2662 2018-06-29 20:50:17 -07:00
ALongStringOfNumbers 483a816616 Elementium Tools now repair with Elementium (#2656)
* Elementium Tools now repair with Elementium

* Add proper parameter names

* Revert changes to armor, as I did not change it in the first place
2018-06-21 18:50:13 -07:00
Jared ba245a1499 Maven and jenkins stuff (#2623)
* Add the jenkins build number

* Create Jenkinsfile

* no crashes when no private.properties

* Changed to setupCIWorkspace
2018-06-18 19:27:57 -07:00
TheIllusiveC4 5a148b01f3 Fixed usages of deprecated getFullDiscountForTools method (#2622) 2018-06-18 19:27:33 -07:00
David Vierra c9f8347299 Add JEI handlers for Orechid and Orechid Ignem (#2632)
* Add JEI handlers for Orechid and Orechid Ignem

* Make whitespace consistent

* Change lazy-initialized item stacks to init in constructor

* Change `doesOreExist` to take a String instead of an Entry

* Remove `oreDictKey` field since it is only ever used in the constructor

* Add `final` and change access qualifiers where appropriate

* Remove pointless accessor
2018-06-18 19:26:26 -07:00
Rafal Kolanski ba29aff21e In skyblock, use horizon height and void fade as in Void biome. (#2634) 2018-06-18 19:25:10 -07:00
Vincent Lee 0a400e2384 Fix #2641 2018-06-02 10:46:41 -07:00
Vincent Lee 5cfc6349c8 One broken boi. Closes #2630 2018-05-17 20:55:04 -05:00
Vincent Lee 4fda575d4d Fix typo, make some tenses consistent 2018-05-15 23:29:19 -05:00
Vincent Lee a172698dc9 Fix vertical spark range being inconsistent between up and down dirs. Closes #2627 2018-05-13 21:18:55 -05:00
Vincent Lee 767ecf78c2 Narrow bounds of some getEntitiesWithinAAB calls, should yield a very minor performance boost 2018-04-30 02:03:24 -05:00
Vincent Lee 24c542f31f Fix #2618 2018-04-30 01:47:53 -05:00
Vasco Lavos 79f9ea048d builderino 2018-04-24 17:10:01 +01:00
Vincent Lee e6e756815d Delete IRunicArmor interface as it no longer exists. Should now run with TC6 beta. Closes #2608, closes #2612 2018-04-24 10:24:48 -05:00
Vincent Lee ed72ff3d5f No longer crashes when loaded with TC6 beta. Note that this is just a crash-prevention fix, the actual integration still needs modernizing 2018-04-24 01:25:43 -05:00
Vasco Lavos 123e35d444 Update contributors.properties 2018-04-23 19:01:30 +01:00
Vincent Lee c3adac1c04 Mana blaster bursts now spawn off the correct hand, closes #2609 (also fixes color handler making a new entity every render tick) 2018-04-22 15:38:43 -05:00
Vincent Lee 7d48d1ffb9 Fix some flower sparkle particles not accounting for vanilla flower random shifts 2018-04-18 18:35:31 -05:00
Vincent Lee 4123a8beb3 Fix munchdews going on long cooldowns too often. Closes #2449 2018-04-18 18:24:35 -05:00
Vincent Lee 7fe66d4868 Blacklist bursts from interdiction torch properly 2018-04-17 11:25:48 -05:00
Vincent Lee 4577e17553 Bandaid for apothecary crashes. Closes #2471, closes #2555 2018-04-17 10:04:44 -05:00
QuarterAnimal 4383e8cbbc Support rotation of structures containing mana spreaders (#2599) 2018-04-11 22:09:37 -05:00
Vincent Lee 34afbd45ab Fix #2590 baubles disappearing 2018-04-09 10:28:47 -05:00
Vincent Lee e3e4522339 Fix functional flower advancement having a broken icon 2018-04-08 14:32:50 -05:00
Vincent Lee 28e8a3df94 Fix accidental api dependency on botania-proper. Closes #2597 2018-04-08 14:29:55 -05:00
Vincent Lee 770d40c95b Finish move to ResLoc subtiles 2018-03-29 19:42:06 -05:00
Vincent Lee 58fa185ef4 Merge branch 'master' into flattening_test 2018-03-29 19:09:19 -05:00
Vincent Lee 01c81b9177 Partially-done migration of subtiles from strings->resource locations 2018-03-29 19:08:42 -05:00
Vincent Lee d396d089f4 Add some rambling notes about handling specialflowers in 1.13, nothign to see here 2018-03-29 00:28:50 -05:00
Vincent Lee 920f9e2676 Extrapolated bucket now picks up mod fluids. Closes #2585 2018-03-25 10:18:25 -05:00
Vincent Lee f477d4eb29 Fix thermalilies not penalizing for giving it lava while on cooldown
No idea how that return snuck back in there, it got explicitly removed
in the past. Looks like 5211ed9 introduced it.
Enjoy your unnerfed thermalilies for the last 2 years while you can!
2018-03-24 02:00:59 -05:00
Vincent Lee 34280c942b Fix particles 'snapping into place', a vanilla bug. Closes #2217 2018-03-19 22:26:31 -05:00
Vincent Lee 4f4971ca73 Gaia guardian minor fixes: make anti-flight smarter, and search for initial player aggro further in the entire arena. Closes #2304 2018-03-16 17:50:38 -05:00
Vincent Lee 51e8c30c7b Add config to disable botania's f3 debug info. Closes #2232 2018-03-15 18:07:39 -05:00
Vincent Lee 4e8b4a6422 Clean up special flower model code. No longer loads all flower models twice 2018-03-15 16:45:42 -05:00
Vasco Lavos 16afd62152 Update contributors.properties 2018-03-15 20:08:03 +00:00
Vincent Lee 6cc3af360b Fix tiny potato banners being unobtainable, closes #2537.
Registration was done in preinit before the itemblock was registered
2018-03-14 20:50:39 -05:00
Vincent Lee 54f901dce9 Featherfeet no longer increases fall distance, fixes #2516 2018-03-14 20:37:48 -05:00
Vincent Lee bb087f3d82 Fix missing sideonlies, closes #2572 2018-03-14 20:16:40 -05:00
Vincent Lee d502c90b91 Fix sparks not transferring mana properly to mana-voided pools. Closes #2557 2018-03-14 20:12:10 -05:00
Vincent Lee 99d34a7980 Flatten petalblocks 2018-03-08 13:40:31 -06:00
Vincent Lee 2d567f04cb Flatten spreaders 2018-03-07 19:49:29 -06:00
Vincent Lee 35ca7002ec Flatten crates 2018-03-07 18:32:30 -06:00
Vincent Lee 168d484621 Flatten apothecaries 2018-03-06 18:27:57 -06:00
Vincent Lee b1598d701d Flatten platforms 2018-03-06 17:38:47 -06:00
Vincent Lee 3f9993d762 Flatten pylons 2018-03-06 14:30:45 -06:00
Vincent Lee 91b9c2e0c8 Flatten pools 2018-03-06 11:17:52 -06:00
Vincent Lee d8d0d0ff13 Flatten azulejos 2018-03-06 01:03:42 -06:00
Vincent Lee 174183332f Flatten drums 2018-03-05 12:00:37 -06:00
Vincent Lee 01e1bf7c59 Flatten storage blocks 2018-03-05 11:05:39 -06:00
Vincent Lee 9dfa61c7fa Flatten alt grasses 2018-03-05 00:35:08 -06:00
Vincent Lee 1a10608c11 Merge branch 'master' of github.com:Vazkii/Botania into flattening_test 2018-03-04 23:52:38 -06:00
PomeloBooks 8d6e5c6c87 Fix a typo. (#2569) 2018-02-27 10:04:53 -06:00
Vasco Lavos 96843f31d7 Update contributors.properties 2018-02-22 22:50:09 +00:00
Darinth 76aeceb43a Updating ISSUE_TEMPLATE.MD (#2558)
* Added notice section, formatted with linebreaks

Notice section on top give instructions directing people to the forums or reddit to post ideas as indicating by the contributing.md, because missing the contributing.md file is incredibly easy. I did it, my apologies to Vazkii and Willie. Figured out how to force blood line breaks in the markdown and addeed said line breaks at appropriate locations. Also added a tip at the top so people who post issues know how to do so, because I didn't.

* Commented out the Notice section

Because it works and means that even if someone forgets to delete the notice section, it still won't be seen!
2018-02-14 23:51:06 -06:00
Vincent Lee c4715df02f Fix JEI integration for floating magic flowers 2018-02-08 11:58:22 -06:00
Vincent Lee 00d3dc3a47 Minor bugfixes on spawner mover 2018-01-31 11:02:45 -06:00
Vasco Lavos 60b160472d builderino 2018-01-26 22:40:15 +00:00
Vasco Lavos 51e08be79d Merge pull request #2505 from quat1024/fixChestCaps
Fix #2497 by removing unneeded special-casing for TileEntityChest
2018-01-26 21:51:49 +00:00
Vasco Lavos b2067de2c2 Merge pull request #2506 from quat1024/fix2474
Fix #2474 (wrong crafty crate image for one of the patterns)
2018-01-26 21:51:38 +00:00
Vincent Lee 71ebe39785 Update all Optional.Interface things to have proper modid, tc could be on 1.12 any time now 2018-01-26 10:59:12 -06:00
Vincent Lee 7f8c1360ee Fix mana splitters and manastars loading chunks when placed on a chunk border (probably more cases to fix later) 2018-01-25 22:01:22 -06:00
Vincent Lee 065ab12af9 Hourglasses no longer spam resyncs as much, and don't cause chunk rerenders when they flip 2018-01-25 21:52:02 -06:00
Vincent Lee d95d432dbe Fel pumpkin blazes now draw their drops from a loot table. Closes #2521 2018-01-25 21:16:03 -06:00
Vasco Lavos c791f02711 Update contributors.properties 2018-01-25 15:53:06 +00:00
Vincent Lee 30309431e8 Flatten slime bottle 2018-01-22 11:27:26 -06:00
Vincent Lee c9ded8a20f Update some outdated questions on the FAQ 2018-01-18 20:54:05 -06:00
Vasco Lavos a602860caf Update contributors.properties 2018-01-17 22:56:27 +00:00
Vincent Lee c8f183c08c use new baubles packetsync constructor. bump baubles dep. Closes #2509 2018-01-17 00:47:06 -06:00
Vincent Lee 0d0eaeb121 Merge branch 'master' of github.com:Vazkii/Botania into flattening_test 2018-01-11 23:31:56 -06:00
Vincent Lee 4ff5b6f7ca Manastar now uses serverside mana information 2018-01-11 23:23:22 -06:00
Vincent Lee 161928b14c Fix pools with sparks on them constantly sending resync packets even when nothing was happening 2018-01-11 22:56:35 -06:00
Vincent Lee 124fc8518a Don't blanket implement ITickable on everything, some TE's are now non-tickable (e.g. prisms, platforms), yields minor performance increase 2018-01-11 22:23:33 -06:00
Vincent Lee 446bd04b3d Fix animated torches not causing block updates in some situations, closes #2510 2018-01-11 15:30:11 -06:00
Vincent Lee 44738451ef Shorten loonium potion effects on creepers, closes #2233 2018-01-11 14:29:34 -06:00
Vincent Lee e4102224b6 Fix config gui being broken -.- 2018-01-10 15:01:38 -06:00
Vincent Lee 4ce813b5ce Increase blood pendant refresh time, closes #2503 2018-01-09 17:30:29 -06:00
quat 0b108e5703 Fix #2474 (wrong crafty crate image for one of the patterns) 2018-01-09 00:22:30 -05:00
quat 37b3e36438 Fix #2497 by removing unneeded special-casing for TileEntityChest (this caused problems with other mods extending TileEntityChest) 2018-01-09 00:04:52 -05:00
quaternary 35bdd48eed Fix #2486 (un-switch Toggle and Fork luminizer recipe pages in the lexica) (#2504) 2018-01-08 21:10:46 -06:00
Vincent Lee 980988a674 Bump API version since last commit changes the API 2018-01-07 12:19:53 -06:00
Vincent Lee 23377aeee9 Allow pure daisy inputs to be state-sensitive. Closes #2501 2018-01-06 13:09:16 -06:00
Jonathan Smith 1b4566388a Fix #2498 - slight compromise for it, it'll display Map #0 in the recipe but will accept any map to make it. 2018-01-06 11:35:46 +00:00
Jonathan Smith 3583da80c4 Fix #2494 2018-01-01 17:22:18 +00:00
Vincent Lee 0cc9950b0c Apply the fix from 2494a5 to bifrost blocks, and minor cleanup 2017-12-31 20:14:19 -06:00
Vincent Lee b62ae8a2cb Detector rails can now take comparator output from pool minecarts, like they do for chest carts. Output calculated with same formula as a comparator on a pool block itself. 2017-12-31 20:14:19 -06:00
Vasco Lavos 639fcc78f4 Update contributors.properties 2017-12-30 20:09:20 +00:00
Vincent Lee cb482e82c3 JEI cleanups thanks to Java8 2017-12-28 20:28:15 -06:00
Vincent Lee d244e12437 Minor network bandwidth optimization: use vanilla block events when possible because those hvae smaller packet sizes 2017-12-28 13:11:50 -06:00
Vincent Lee c7c0df4f79 Flatten black lotuses 2017-12-27 15:35:00 -06:00
Vincent Lee abcf2a748b Flatten corporea sparks 2017-12-27 15:00:49 -06:00
Vincent Lee 4afaacb351 (Huge diff) Forgot to lowercase lang files when lowercasing reg names earlier 2017-12-24 18:12:04 -06:00
Vincent Lee 9b14ab4e2c Flatten cosmetics (easier than expected) 2017-12-24 17:46:46 -06:00
Vincent Lee d836be4bd6 Lowercase libitemnames since 1.13 resloc constructor now throws instead of lowercasing for you 2017-12-22 14:07:36 -06:00
Vincent Lee 7afd84d5f1 Flatten runes (a bit dirty since we don't have tags yet) 2017-12-22 14:05:34 -06:00
Vincent Lee b70bb95c1b Flatten craft patterns, also refactor crafty crate a bit 2017-12-21 22:52:30 -06:00
Vincent Lee daa1362d41 'flatten' bh talisman similar to temperance stone 2017-12-21 22:02:02 -06:00
Vincent Lee b9a889d908 Fix temperance stone fixer not working 2017-12-20 20:17:55 -06:00
Vincent Lee e71274317b Flatten ancient wills 2017-12-20 19:52:06 -06:00
Vincent Lee 6efe7026a6 'flatten' bottled mana, add fixer for moving things to NBT 2017-12-20 15:50:03 -06:00
Vincent Lee 386f76e5bf Flatten spark upgrades 2017-12-19 12:08:13 -06:00
Vincent Lee 53543d607a 'flatten' temeprance stone 2017-12-19 11:44:25 -06:00
Vincent Lee 6339c75e40 Fix some portuguese pavement double slabs having the wrong color, which apparently no one noticed for a year+ *shrug* 2017-12-19 10:50:08 -06:00
Vincent Lee b37764bd30 Flatten seeds 2017-12-19 10:42:56 -06:00
Vincent Lee a0182a7bf8 Flatten viruses 2017-12-18 16:39:53 -06:00
Vincent Lee ae5ca7d44c Merge branch 'master' into flattening_test 2017-12-18 15:52:42 -06:00
Vincent Lee 4c744f96e2 Hide helmet of revealing recipe from recipe book, and clean up some unnecessary overrides 2017-12-18 15:37:57 -06:00
Vincent Lee 01c9333016 Flatten dyes and petals 2017-12-18 15:32:36 -06:00
Vincent Lee d9d3015ffb Get Baubles from Maven, no more downloading a broken -deobf jar manually 2017-12-17 21:32:25 -06:00
Vincent Lee c3324c64e4 Merge branch 'master' into flattening_test 2017-12-17 21:23:08 -06:00
Vincent Lee 42599c3c8d Call unequip on baubles when dying. With these changes, should fix #1938 2017-12-17 21:05:22 -06:00
Vincent Lee 1872d16ca1 Make reach ring use the new forge attribute, and clean up some weirdness around the attribute modifying baubles 2017-12-17 19:58:45 -06:00
Vincent Lee bcead7ad7d Target 1.12.2 now 2017-12-17 17:47:43 -06:00
Vincent Lee f5f4e26558 Fix #2466 2017-12-17 16:01:36 -06:00
Vincent Lee ca901c9871 Minor cleanup in corporea 2017-12-16 16:55:09 -06:00
Vincent Lee 1637680750 Flatten lens 2017-12-16 16:10:06 -06:00
Vincent Lee 02fbb7f957 Merge branch 'master' into flattening_test 2017-12-16 12:45:00 -06:00
Vincent Lee 1b4b4cce7a Fix #2462 (and a compile error derp from before) 2017-12-16 12:32:55 -06:00
Vincent Lee a7f4b7ab7b Minor cleanup 2017-12-15 22:04:34 -06:00
Vincent Lee 52281e047b Flatten horns 2017-12-15 21:41:58 -06:00
Vincent Lee e5aa9339df Flatten chakrams 2017-12-15 21:16:48 -06:00
Vincent Lee 1d997c7f3b Flatten Quartz 2017-12-15 20:45:19 -06:00
Vincent Lee a96d2ce1ec Since we're renaming anyways, make the manaresource new names more canonical 2017-12-15 20:07:39 -06:00
Vincent Lee b124c60135 Remove dark quartz disable config 2017-12-15 19:11:30 -06:00
Vasco Lavos 775c0d20c3 Have fun Jared 2017-12-12 22:28:04 +00:00
Vincent Lee 01611be2a9 Fix manaresource recipes in lexicon 2017-12-11 12:26:08 -06:00
Vincent Lee 68583d03d3 Flatten vial/flask 2017-12-11 12:20:15 -06:00
Vincent Lee cf3ab8d337 Fix manaresource unlocal names 2017-12-11 11:56:56 -06:00
Vincent Lee d7ecb447c2 Cleanup in crafting recipes 2017-12-10 20:17:18 -06:00
Vincent Lee d5732131d1 Pass mod id to EventBusSubscriber. Apparently you're supposed to do this. 2017-12-10 20:11:28 -06:00
Vincent Lee 709997e72d Add a fixer to flatten 2017-12-10 19:44:32 -06:00
Vincent Lee 479c659d50 Fix startup crash 2017-12-10 19:30:22 -06:00
Vincent Lee 4c5a058173 Flatten manaresource 2017-12-10 19:15:47 -06:00
Vasco Lavos 2740c3e6fb Update contributors.properties 2017-12-09 20:00:30 +00:00
Vasco Lavos a3b0091a73 good build 2017-12-09 13:23:13 +00:00
Vasco Lavos ba2852c10d bad build 2017-12-09 13:10:35 +00:00
Vincent Lee a238ede251 Remove reference to the scrapped BotaniaV2 in mcmod.info 2017-12-08 16:47:54 -06:00
Vincent Lee 15ab7d67d1 API doc tweak for stack nulls 2017-12-07 13:03:22 -06:00
Vincent Lee eb86921f1d Fix #2429 2017-12-07 12:55:55 -06:00
Vincent Lee 0634799e80 9cedab8 but for spreaders too 2017-12-07 08:49:48 -06:00
codycoolwaffle 6e275ef8d2 Update readme to use CurseForge (#2457)
It's almost 2018. Minecraft Forums are basically dead.
2017-12-07 08:48:04 -06:00
Kitten eb84402b13 Fix incorrect step assist height (#2446)
* Fix incorrect step assist height

* Boi, I messed up, oh no, now it's correct
2017-12-07 08:47:45 -06:00
Vincent Lee 56cf0aa73b Fix loonium loot distribution being skewed, closes #2293 2017-12-03 21:52:01 -06:00
Vincent Lee ceb1af2a38 Fix manastorm charge/corporea index star animations being choppy 2017-12-03 18:46:38 -06:00
Vasco Lavos ceb822b1cb Update contributors.properties 2017-12-02 23:38:32 +00:00
Vincent Lee 25ad5cc06f Move a bunch of advancements to use_item_success trigger 2017-11-26 11:30:22 -06:00
Vincent Lee e068b4675b Fix CME in CorporeaRequestTrigger 2017-11-26 11:30:22 -06:00
Vincent Lee 794d0284d1 Move GG no armor to advancement 2017-11-26 11:30:22 -06:00
Vasco Lavos 4daa5bee12 Update contributors.properties 2017-11-26 15:20:53 +00:00
Vincent Lee 7b8ce2e901 Move corporea index advancement to trigger 2017-11-24 14:56:04 -06:00
Vincent Lee ba8c4f8af4 Fix another potential race in GG boss bar collection 2017-11-24 14:56:04 -06:00
Vincent Lee e9bd8e51cc Remove corporea DSU integration because MFR isn't here 2017-11-24 14:56:04 -06:00
Vincent Lee 3d01311604 Fix incorrect corporea result message. Closes #2424 2017-11-24 14:56:04 -06:00
Vincent Lee 21a5f20018 Move alfportal advancement to general trigger 2017-11-24 14:56:04 -06:00
Vincent Lee 1d754b010a Fix lurking race condition in TileCorporeaIndex 2017-11-24 14:56:04 -06:00
Vincent Lee a299257431 Fix division by zero when Ingredient has no stacks. Closes #2444 2017-11-19 09:31:55 -06:00
Vincent Lee 9cedab815f Fix #2263 2017-11-14 23:01:07 -06:00
Vincent Lee 68f09b02a1 Fix #2437 Manastorm charges don't give mana 2017-11-14 22:50:38 -06:00
Vasco Lavos 84d7acc655 builderino 2017-11-11 16:08:43 +00:00
Vasco Lavos 45bec074fd Merge pull request #2402 from quat1024/gourmachew
Gourmarillys produce chewing sounds and particles
2017-11-11 14:26:02 +00:00
Vasco Lavos d297b9738f Merge pull request #2416 from codewarrior0/patch-1
Add Beetroot to Full Crop Farm challenge
2017-11-11 14:23:36 +00:00
Vincent Lee 5b9a19231e Extra imports 2017-11-05 14:28:47 -06:00
Vincent Lee 2ff4db9650 Modernize flaky TE reading in BlockPool, closes #2436 2017-11-05 14:25:57 -06:00
Vincent Lee 6fcd8e1f94 Fix #2433 2017-11-04 22:24:18 -05:00
Vincent Lee 003589ee22 Add issue template, adapted from TF's 2017-11-02 11:26:28 -05:00
wiiv 2642f4f97e Revert "Sneaky Halloween specials."
This reverts commit 5c889a6e20.
2017-10-29 16:46:15 +00:00
wiiv 5c889a6e20 Sneaky Halloween specials. 2017-10-29 01:09:35 +00:00
Vincent Lee a0813e5f22 Fix shaders loading twice on startup 2017-10-19 08:49:18 -05:00
Vincent Lee 0ad1a96468 Fix #2009. stopgap for when Forge PR 4331 lands 2017-10-19 08:45:12 -05:00
Vincent Lee 7b3e9a3118 Fix rannuncarpus destroying shulker box and other itemized TE data. closes #2419 2017-10-19 08:32:02 -05:00
Vasco Lavos 91b4bb0a8b Update contributors.properties 2017-10-16 19:57:35 +01:00
David Vierra f53d5f2dad Add Beetroot to Full Crop Farm challenge 2017-10-15 16:19:30 -10:00
Vincent Lee 66bca44d27 Fix chiseled quartz being uncraftable, closes #2415 2017-10-15 18:53:26 -05:00
Vincent Lee f55fa57d14 Fix #2299 2017-10-15 18:28:51 -05:00
quat 6ec0807a4c Cleanup a bit, pitch down burps as mana returns dimish 😋 2017-10-04 17:45:14 -04:00
Urey. Xue 9ad33b0cdf Update zh_cn.lang (#2154)
* Update zh_CN.lang

* Update zh_CN.lang

* Update zh_cn.lang

* Update zh_cn.lang

According to Meow-J/Mod-Translation-Styleguide#10

* Update zh_cn.lang

Hope this is last one.
2017-10-01 17:29:42 -05:00
Vasco Lavos ddb0255bcb builder 2017-10-01 19:24:45 +01:00
Vasco Lavos d81543fe47 Actually fix #2379 2017-10-01 19:19:31 +01:00
Vasco Lavos 42fccc9781 Make botania shaders work with albedo 2017-10-01 19:18:00 +01:00
Vasco Lavos bd296a410a blarg 2017-09-30 22:21:17 +01:00
quat a51867d966 Gourmaryllis produce particles and sound effects while eating.
(The effects slow down, too, as you feed the flower more of the same food. Hopefully this makes the gourma's "dimishing returns" mechanic more clear.)
2017-09-30 17:19:12 -04:00
Vasco Lavos c631e6409b buildy 2017-09-30 22:07:35 +01:00
Vasco Lavos e22003a4b2 Fixed mushrooms not fitting in the petal apothecary 2017-09-30 20:50:44 +01:00
Vasco Lavos 6b764eef26 Make the rune crafter challenge be categorized as Lunatic+ instead of Lunatic. 2017-09-30 19:20:32 +01:00
Vasco Lavos 1fe3a69101 Add Shulk Me Not to the challenges 2017-09-30 19:20:01 +01:00
Vasco Lavos 2dcb88b727 . 2017-09-30 19:02:47 +01:00
Vasco Lavos 0c6e5ca51a Disabled the version checker because it's 2017 and nobody needs those anymore. 2017-09-30 18:46:15 +01:00
Vasco Lavos 607e6bbaff Fixed the lexica botania's item tooltip not calling forge tooltip events. 2017-09-30 18:08:30 +01:00
Vasco Lavos e741ce1c94 Change recipe for the cocoon 2017-09-30 17:53:31 +01:00
Vasco Lavos 99ccb5c29e Recipe/docs for the Shulk Me Not 2017-09-30 17:24:06 +01:00
Vasco Lavos 459be17a00 Shulk Me Not 2017-09-30 16:25:13 +01:00
Vasco Lavos 06134d2acf The cocoon of caprice can now accept items from drops. 2017-09-30 13:54:57 +01:00
Vasco Lavos 7ea4b802a1 Added the tutorial video from Mischief of Mice. Finally it's back! 2017-09-30 13:40:04 +01:00
Vasco Lavos 0dc7e813ea Fixed the life imbuer going outside the inventory box 2017-09-30 13:36:16 +01:00
Vasco Lavos 5862e6b6be Fixed flugel tiara not rendering the proper icons. Closes #2363 2017-09-30 13:29:49 +01:00
Vasco Lavos ccf7971dc6 Add a check to getOrientation for redstring. Closes #2384 2017-09-30 13:25:27 +01:00
Vasco Lavos c45270431f Fixed the ingame downloader to use https. Closes #2359 2017-09-30 13:22:51 +01:00
Vasco Lavos ef82d0325c Added the ability for the Lexica Botania to swap between various items that a recipe can match based on time. Finally. Closes #2372 2017-09-30 13:22:00 +01:00
Vasco Lavos 75a30f27b5 Merge branch 'master' of https://github.com/Vazkii/Botania 2017-09-30 13:03:11 +01:00
Vasco Lavos f9d0ab39af Add some null checks to armorset verification. Closes #2379 2017-09-30 13:03:01 +01:00
Vasco Lavos 74120cd5f6 Merge pull request #2251 from kid2407/kid2407-patch-1
fixed two typos in de_DE.lang
2017-09-30 13:00:00 +01:00
Vasco Lavos 4ccf4e7275 Merge pull request #2396 from quat1024/master
Daffomills and anime torches face away from the player when placed
2017-09-30 12:59:48 +01:00
quat 493c3e9b13 Usability tweak - daffomills and anime torches face away from the player, instead of always facing north 2017-09-29 23:35:42 -04:00
Vincent Lee 4b6bf5bf38 Fix #2368 2017-09-29 16:23:22 -05:00
wiiv 264b1c9ce4 Me neither. 2017-09-26 21:48:40 +01:00
wiiv 802d41e0d3 Not me. 2017-09-26 21:40:23 +01:00
Vincent Lee d21df2aa21 Fix world-compatibility for new azulejos 2017-09-25 15:38:52 -05:00
Vincent Lee 8c8b41ce83 Fix #2381 2017-09-24 16:43:03 -05:00
Vincent Lee bc6f1510a1 Merge pull request #2391 from Infinoid/master
Fix Mana Fluxfield max energy value.
2017-09-24 12:13:06 -05:00
Mark Glines d3f25a59cd Fix Mana Fluxfield max energy value. 2017-09-24 06:19:43 -04:00
Vasco Lavos 4fda4a9d6c Update contributors.properties 2017-09-23 21:53:36 +01:00
wiiv 8bf5e00b4a Removed references to the Ring of Aesir. Fix #2374 2017-09-21 15:24:32 +01:00
wiiv 2257d841b9 Added 4 new Azulejo Patterns. Fix #2376 2017-09-21 14:48:19 +01:00
Vincent Lee 05d9709a06 Merge pull request #2371 from codycoolwaffle/patch-2
Infinite Hopperhock usage fix
2017-09-20 17:07:45 -05:00
Vincent Lee d16345db41 Why do sideonly methods exist? Fix #2389 2017-09-20 17:06:03 -05:00
Vincent Lee 0e2a84daa1 Fix #2369 2017-09-20 11:59:28 -05:00
Vincent Lee 6327203634 Missed a few from last commit 2017-09-20 08:08:45 -05:00
Vincent Lee 8f09bc403d Fix #2365 2017-09-20 08:06:06 -05:00
Vincent Lee fc37455de6 Fix #2367 2017-09-20 07:51:21 -05:00
Vincent Lee e72ceb82c1 Fix #2366 2017-09-18 07:57:11 -05:00
wiiv a18d45a62f More updated assets. 2017-09-11 21:34:20 +01:00
codycoolwaffle 1d778537de Infinite Hopperhock usage fix
Closes #2370
2017-09-08 23:32:42 -07:00
Vincent Lee 5a5d49d98b Fix #2361, and probably fixes #2346, caused indirectly by ModCoderPack/MCPBot-Issues#302. 2017-09-06 14:57:39 -05:00
Vasco Lavos 61078fd17e Update contributors.properties 2017-09-06 02:21:52 +01:00
Vincent Lee eab67fea13 big derp. Fixes #2357 2017-09-04 23:27:07 -05:00
Vasco Lavos f327fb5125 Build 347 2017-09-04 22:01:17 +01:00
Vasco Lavos ab126ac9db Fixed crashes when viewing the Dandelifeon and Elven Mana Lenses pages. Closes #2355 2017-09-04 21:41:37 +01:00
wiiv 71a1d47291 Fixed and updated some more assets. 2017-09-04 21:29:00 +01:00
Vasco Lavos 8107ec8b03 Update contributors.properties 2017-09-03 16:01:19 +01:00
Vasco Lavos 435d59798c Build 346 for 1.12.1 2017-09-02 19:18:38 +01:00
Vasco Lavos 97cc9fe5f6 Build files 2017-09-02 19:02:41 +01:00
Vasco Lavos 25d443f3e2 Compress textures 2017-09-02 18:54:11 +01:00
Vasco Lavos b71198b31e Document the Gourmaryllis and buff it a little bit. 2017-09-02 18:51:45 +01:00
Vasco Lavos fe7fad813a Bump API version 2017-09-02 18:38:56 +01:00
Vasco Lavos b89620c267 Fixed the pylon render for multiblock displays 2017-09-02 18:26:44 +01:00
Vasco Lavos 07d7166b43 Merge branch 'master' of https://github.com/Vazkii/Botania 2017-09-02 18:26:22 +01:00
Vasco Lavos cb1b194e3f Albedo support 2017-09-02 18:26:16 +01:00
Vincent Lee 0df3240481 Get rid of a model error 2017-09-02 11:20:10 -05:00
Vincent Lee 0efc8e9fdb Get rid of spreader item model warnings 2017-09-02 11:16:22 -05:00
Vincent Lee 927db3c088 Readd missing waterbowl textures 2017-09-02 11:03:55 -05:00
Vasco Lavos 678fd193da Pylon rendering 2017-09-02 17:02:33 +01:00
Vasco Lavos 2e0d8ed8a5 Merge branch 'master' of https://github.com/Vazkii/Botania 2017-09-02 16:45:50 +01:00
Vasco Lavos e0bebe5d2a Fix weird preview animations at high framerates 2017-09-02 16:45:41 +01:00
Vincent Lee dbb61cf855 Revert new default lexicon icon/model for now 2017-09-02 10:39:09 -05:00
Vasco Lavos b79377b901 Narslimmus buff 2017-09-02 16:31:18 +01:00
Vasco Lavos 3f39f5aad1 Revert "Terrasteel now made in nugget amounts, alf portal and natura pylon made cheaper"
This reverts commit ef9efb0dfe.
2017-09-02 16:29:36 +01:00
Vasco Lavos 872e98a5b0 Revert more number changes 2017-09-02 16:29:27 +01:00
Vasco Lavos 99a5a2a7ba Revert number changes 2017-09-02 16:28:49 +01:00
Vasco Lavos 27ea4e2db8 Revert terrasteel nuggets 2017-09-02 16:27:28 +01:00
Vasco Lavos 2bfcbb3bc5 Revert "Update lexicon entry"
This reverts commit 42d9e18b56.
2017-09-02 16:26:44 +01:00
Vasco Lavos 259bd4ff37 Revert "Fix lexicon entry on terrasteel page"
This reverts commit 4a0416a557.
2017-09-02 16:26:06 +01:00
Vincent Lee fcb2375fe5 Fix some missing textures 2017-09-02 10:17:11 -05:00
Vasco Lavos 93a845a1b8 Fixed some warnings 2017-09-02 16:13:42 +01:00
Vasco Lavos 938aab69e5 Merge pull request #2347 from Vazkii/1.12
1.12
2017-09-02 15:10:32 +01:00
wiiv f7297534e2 If nothing explodes, the art overhaul is done! 2017-09-02 14:41:34 +01:00
Vincent Lee e32ce47f53 Merge pull request #2340 from gerhard2202/shaky-lexicon-fix
Fixes the shaking mouse-over elements in the Lexicon.
2017-09-01 22:55:52 -05:00
Vasco Lavos 3b06d5f1dd Update contributors.properties 2017-09-02 02:26:29 +01:00
gerhard2202 a9a1ffd195 Changed my fix to use the new partial ticks instead of the old ones and updated the variable names to be more descriptive. 2017-09-01 20:15:44 -04:00
Vincent Lee 9219008845 Merge pull request #2341 from gerhard2202/band-of-aura-crash-fix
Fixes the crash when trying to view the recipe for the Band of Aura
2017-08-28 23:12:14 -05:00
Vincent Lee 0f03c04c33 Merge pull request #2339 from gerhard2202/catalyst-fix
Fixes the alchemy catalyst eating everything and never working
2017-08-28 23:10:20 -05:00
gerhard2202 0093da7ceb Fixes the alchemy catalyst eating everything and never giving anything back.
The issue was that mini flower recipes were being registered before the specialFlower block item was registered, so the recipes for mini flowers were defaulting to having an input and output of Air blocks, breaking all the alchemy recipes.
2017-08-28 22:14:54 -04:00
gerhard2202 ee8f6876f2 Fixes the shaking mouse-over elements in the Lexicon. 2017-08-28 22:11:01 -04:00
gerhard2202 08a990300e Fixes the crash when trying to view the recipe for the Band of Aura in the Lexicon. 2017-08-28 22:06:31 -04:00
wiiv 03a96edb44 More asset changes for the art update. 2017-08-28 02:58:29 +01:00
wiiv 7ff0fd2d18 Another batch of the art update. 2017-08-24 05:29:44 +01:00
Vincent Lee 00d650926a Workaround for #2303 2017-08-22 12:18:08 -05:00
Vincent Lee fa5059a883 Break GG onLivingUpdate method apart a bit so it's easier to read 2017-08-21 15:22:53 -05:00
Vincent Lee df0d9efefc Pylon items render correctly 2017-08-20 14:57:08 -05:00
Vincent Lee 079300fdbd Munchdew has visual cooldown feedback. closes #2315 2017-08-20 14:39:07 -05:00
Vincent Lee 34005c4a62 Minor cleanup in lexicon 2017-08-20 14:23:06 -05:00
Vincent Lee f3dcb4f68f Bump major version 2017-08-20 12:23:53 -05:00
Vincent Lee 4eac5e44c4 Fix #2330 2017-08-20 12:23:08 -05:00
Vincent Lee 9fa41e68b3 Fix a couple broken texture paths 2017-08-19 23:55:55 -05:00
Vincent Lee 3f41aa0943 Fix pylon item model (kind of) 2017-08-19 23:37:33 -05:00
Vincent Lee 443de41647 Attempt to fix pylon model rendering 2017-08-19 23:17:59 -05:00
Vincent Lee f3f66401f7 Merge branch '1.12' of github.com:Vazkii/Botania into 1.12 2017-08-19 22:53:41 -05:00
wiiv 4b4fa5560e First art revamp commit! 2017-08-19 10:31:07 +01:00
Vincent Lee f52ec0a630 Modernize a spreader method 2017-08-16 16:43:01 -05:00
Vincent Lee 6c38e671d0 Split model paths for pylons 2017-08-15 20:52:23 -05:00
Vincent Lee e2c7a8ec4b Remove ancient pylon model 2017-08-15 20:32:09 -05:00
Vincent Lee 4a0416a557 Fix lexicon entry on terrasteel page 2017-08-15 15:39:30 -05:00
Vincent Lee 98930a924a Remove aesir ring 2017-08-15 15:18:19 -05:00
Vincent Lee 679ebb19be Merge branch '1.12' of github.com:Vazkii/Botania into 1.12 2017-08-15 15:10:50 -05:00
Vincent Lee e21ccbc7bd Merge pull request #2329 from codewarrior0/issue-2322-particle-bias
Fix #2322 - particle bias
2017-08-07 22:41:39 -05:00
David Vierra 2fe4dad9da Fix #2322 - particle bias
Particles now wiggle along each secondary axis independently.
2017-08-07 17:29:03 -10:00
Vincent Lee f2632d1d39 Allow shaders to be reloaded using F3+T 2017-08-07 21:22:55 -05:00
Vincent Lee 1fb517ef5b Merge branch 'master' of github.com:Vazkii/Botania into 1.12 2017-08-07 21:11:40 -05:00
Vincent Lee 42d9e18b56 Update lexicon entry 2017-08-07 21:09:52 -05:00
Vincent Lee bb55bf57c8 Add mana diamond and pearl 1/9th units, terrasteel nuggets crafted using them 2017-08-07 21:07:09 -05:00
Vincent Lee 63a7aeb8c9 Same as last commit but for 3d model 2017-08-07 20:45:04 -05:00
Vincent Lee 086e8acc2c Lexicon now uses lexicon_elven model if elven knowledge is unlocked 2017-08-07 20:13:34 -05:00
Vincent Lee f569048f40 Merge pull request #2328 from codewarrior0/issue-2326-side-event
Fix #2326
2017-08-07 17:44:24 -05:00
David Vierra 99f597d6a2 Fix #2326 2017-08-07 10:05:01 -10:00
Vincent Lee 6b4a2f6db3 Number tweaks 2017-08-04 23:23:40 -05:00
Vincent Lee e14c31c471 Fix #2319 2017-08-03 07:34:45 -05:00
Vincent Lee ef9efb0dfe Terrasteel now made in nugget amounts, alf portal and natura pylon made cheaper 2017-08-02 20:41:51 -05:00
Vincent Lee bf0061739b Nerf pre-elven generators by 1/3, buff rafflowsia by 2.5 2017-08-02 19:32:32 -05:00
Vincent Lee cc727c6cac Fix missed blaze mesh and a warning in clientproxy 2017-08-02 18:00:40 -05:00
Vincent Lee 4015913e58 Rename blaze lamp and mana distributor 2017-08-02 00:11:59 -05:00
Vincent Lee d897138d90 Gourmaryllis now is healthy and likes balanced diets 2017-08-02 00:01:44 -05:00
Vincent Lee 6c76aa0117 Mushrooms are now OD'ed to petals 2017-07-30 18:31:53 -05:00
Vincent Lee fcfb7d2356 Dice now succeeds until all relics are unlocked 2017-07-30 18:30:59 -05:00
Vincent Lee c8f137eccf Use a criterion trigger for relic binding instead of simple pickup, so the advancement isn't granted to people who pickup others' relics 2017-07-30 18:11:15 -05:00
Vincent Lee 2dc50866a1 Remove deprecated relic binding by name in favor of uuid 2017-07-30 17:39:33 -05:00
Vincent Lee a2a0ba4275 Rafflowsia can now eat anything except itself 2017-07-30 17:18:49 -05:00
Vincent Lee 966406d195 Fix relic lexicon entries and add relic advancements 2017-07-30 14:24:50 -05:00
Vincent Lee 3790652d3d Some missing challenge advancements 2017-07-30 13:33:05 -05:00
Vasco Lavos 1102792bf9 Change GUI buttons for the lexica. 2017-07-30 18:06:23 +01:00
Vincent Lee 8f12fbde20 Fix a todo 2017-07-23 16:38:58 -05:00
Vincent Lee 6fc22e19da Fix flugel eye use animation and particles, and make binding interaction less intrusive 2017-07-22 21:42:49 -05:00
Vincent Lee 03ece97fdf Merge branch '1.12' of github.com:Vazkii/Botania into 1.12 2017-07-22 17:28:24 -05:00
Vincent Lee 2b2f48f085 Remove pickDefaultState hack from 1.9 since it's unneeded now 2017-07-22 17:14:46 -05:00
Vincent Lee 35d440ad37 Add note for pagecraftingrecipe 2017-07-20 23:45:23 -05:00
Vincent Lee 9d78aca015 Clean up some todos 2017-07-20 23:42:45 -05:00
Vincent Lee a990e6a8d5 Diff spam warning: Bump forge, move wand recipes to json. Are we done? 2017-07-20 23:34:11 -05:00
Vincent Lee c3ff13bce0 More. recipes. 2017-07-20 20:53:00 -05:00
Vasco Lavos 9c2eae6a33 Update contributors.properties 2017-07-20 17:55:01 +01:00
Vincent Lee 73b440732a Remove debug log from prev commit 2017-07-16 18:42:19 -05:00
Vincent Lee 9f0068538e Fix #2309 and also fix the particles not accounting for position shift 2017-07-16 18:41:25 -05:00
Vincent Lee 1d810fba7a More recipes. 2017-07-16 15:53:44 -05:00
Vincent Lee 63b9fa19d1 Moar recipes, fix wand recipes 2017-07-15 21:20:56 -05:00
Vincent Lee 0d25e3913b Bump forge 2017-07-15 14:08:08 -05:00
Vasco Lavos 924ee0267b buildy 2017-07-15 15:01:38 +01:00
Vincent Lee adfc6e41d9 Check spark liveness before interacting. Closes #2302 2017-07-13 20:21:11 -05:00
Vincent Lee fed7394e0c Moar recipes back in lexicon 2017-07-13 20:18:08 -05:00
Vincent Lee 833324e150 Some recipes displaying in lexicon again 2017-07-09 12:18:20 -05:00
Vincent Lee adfa6c92c0 Cleanup some volatiles 2017-07-05 20:14:02 -05:00
Vincent Lee 7c008784d8 Cleanup: switch bunch of things to @EventBusSubscriber 2017-07-05 20:08:50 -05:00
Vincent Lee 1ec96fc475 Some prep work for recipes in lexicon 2017-07-05 20:00:02 -05:00
Vincent Lee 130e3916b2 Fix advancement parents 2017-07-04 12:22:07 -05:00
Vincent Lee 69b2e1483c Bunch more advancements (that don't seem to work for some reason >.>) 2017-07-02 21:58:56 -05:00
Vincent Lee 6671486c11 Rename translation keys for generating/functional flower advancements as they were inaccurate 2017-07-01 22:18:43 -05:00
Vincent Lee 27d66c18ba Fix code granting of criterion for last commit 2017-07-01 22:16:56 -05:00
Vincent Lee 288bbf5dc1 Fix terrablade title and desc 2017-07-01 22:13:15 -05:00
Vincent Lee cf593abd21 Rename all the jsons from their vocaloid names to unlocal names for ease of lookup 2017-07-01 22:12:57 -05:00
Vincent Lee 1b157c4f86 A couple more advancements 2017-07-01 22:09:52 -05:00
Vincent Lee f0e13b7d3b More advancements 2017-07-01 16:28:50 -05:00
Vincent Lee 38e1a5a1f1 Fix base advancements being specified dumbly 2017-07-01 08:31:05 -05:00
Vincent Lee 209b52bb80 Fix the few guis we have 2017-06-29 20:58:51 -05:00
Vincent Lee d7ffc27dc9 Some more advancements 2017-06-29 20:47:27 -05:00
Vincent Lee e571fc4915 Don't reinvent the wheel, GardenOfGlass recipe condition is just forge:mod_loaded 2017-06-29 20:25:36 -05:00
Vincent Lee cf0819e9b9 Some advancements 2017-06-29 20:12:04 -05:00
Vincent Lee 797fd9257c Start work on advancements 2017-06-27 23:16:27 -05:00
Vincent Lee 84845f9c5c Fix getsubblocks 2017-06-27 21:30:15 -05:00
Vincent Lee 7feea17302 Update forge and fix compiles, and cleanup some recipes 2017-06-27 21:26:48 -05:00
Vincent Lee b29e95df81 Switch to new getDrops 2017-06-25 16:56:31 -05:00
Vincent Lee 4091c7e4fb Fix some todos, modernize JEI, other housekeeping 2017-06-25 16:44:08 -05:00
Vincent Lee 4cc6ab2266 Fix all recipes except wand 2017-06-25 16:05:08 -05:00
Vincent Lee 3c95f951dd Misc fix other recipes, remove dumper code 2017-06-25 15:52:02 -05:00
Vincent Lee 19aec9d25b Enable/disable recipes appropriately based on GoG 2017-06-25 15:32:17 -05:00
Vincent Lee 18bf7526b2 Move most recipes to json 2017-06-25 14:42:54 -05:00
Vincent Lee e4b8bb2b52 Hide dynamic recipes from the book 2017-06-25 12:04:39 -05:00
Vincent Lee 789a380e7d Move things to AT so we know when they break immediately 2017-06-25 11:43:35 -05:00
Vincent Lee 37098050cc Fix block oredict registration throwing errors 2017-06-25 09:33:00 -05:00
Vincent Lee 5332cdfad2 Fix getSubItems 2017-06-25 09:26:34 -05:00
Vincent Lee c58ae21173 Fix sounds (removing BotaniaSoundEvents, query the registry directly
instead

Full optimize imports (sorry diff thrash :/)
2017-06-25 01:40:46 -05:00
Vincent Lee e0e5503fe8 Bump JEI, get things running 2017-06-25 01:18:06 -05:00
Vincent Lee acfa518f62 Other non-recipe misc fixes 2017-06-25 00:25:15 -05:00
Vincent Lee 1dd68f9558 Move dynamic recipes to new registration system 2017-06-25 00:18:15 -05:00
Vincent Lee 48784fe495 Same for fluff blocks 2017-06-25 00:09:08 -05:00
Vincent Lee 901f70da88 Move non-fluff blocks to new registreation system (yay no more registering in ctors) 2017-06-24 23:47:59 -05:00
Vincent Lee a6b37966a1 Move items, sounds, potions to new registration system 2017-06-24 22:48:35 -05:00
Vincent Lee 101c72e633 Bump forge again 2017-06-24 22:28:18 -05:00
Vincent Lee 835e09ed34 Recipe fixes and bump forge 2017-06-24 17:53:03 -05:00
Vasco Lavos 891969b569 Merge pull request #2289 from Silly511/master
Fix the pixel
2017-06-19 17:04:34 +01:00
Remy A f5b227276a Fix evil pixel 2017-06-19 00:00:21 -05:00
Vincent Lee b765b09b8c More recipe+random fixes 2017-06-17 10:54:48 -05:00
Vincent Lee f3cd87e499 Sub-200 errors 2017-06-17 10:23:04 -05:00
Vincent Lee 174fdfd2a5 More find-replace 2017-06-17 08:59:48 -05:00
Vincent Lee bf0e3bb1c7 More fixes 2017-06-16 08:34:16 -05:00
Vincent Lee 5c145362d8 Lots of find replaces and random fixes 2017-06-16 07:52:59 -05:00
Vincent Lee e85cd75a57 Pass through tesrs, shotgun fontRendererObj to fontRenderer 2017-06-16 07:26:10 -05:00
Vincent Lee de6ad1f7e8 Remove achievement methods from relic 2017-06-16 07:21:26 -05:00
Vincent Lee f97246b77a Remove achievement subpackage, it can all be advancements now 2017-06-16 07:19:48 -05:00
Vincent Lee 16f2322db0 Update gradle 2017-06-16 07:16:41 -05:00
Vasco Lavos 1ca8eb5ee6 Merge pull request #2287 from palaster/master
Fixes Managlass and Elfglass transparencies, Fixes #2272
2017-06-14 20:01:18 +01:00
palaster 2494a5d2b0 Fixes Managlass and Alfglass transparencies
- I saw that BlockGlass was using the method isFullCube and Botania was
using isFullBlock, so I switched it and it seems to have fixed the
issue.
- Removed redundant overwrite of isFullBlock in BlockElfGlass.
2017-06-14 13:46:38 -05:00
Vincent Lee 910a3f2362 Pure daisy no longer runs logic clientside. Closes #2283 2017-06-13 21:29:39 -05:00
Vasco Lavos 22682c4fd0 builderino 2017-06-13 14:36:42 +01:00
Vincent Lee d8c678a96f Merge pull request #2273 from palaster/master
Fixes #2267. Storage Drawers causing crashes and exceptions.
2017-06-08 20:22:38 -05:00
palaster c4f4b5ffaa Updated StorageDrawers Integration.
- StorageDrawers now has support for Capabilities, so Botania no longers
needs a special wrapper for Drawers.
2017-06-04 16:45:41 -05:00
Vasco Lavos 445ad284ec Update contributors.properties 2017-06-02 12:35:07 +01:00
Vasco Lavos 2338c39868 Update contributors.properties 2017-05-28 12:43:25 +01:00
Vincent Lee 69e48d116e Fix #2262 2017-05-13 22:53:27 -05:00
Vincent Lee cde78d9b5b Remove unused unstable block/mana beacon jsons 2017-05-13 22:53:27 -05:00
Vasco Lavos b362d417e7 Update contributors.properties 2017-05-09 18:56:10 +01:00
Vincent Lee 8cf49dc1c0 Reenable shifts on double plants as it works again for forge 2292+ 2017-05-03 14:29:10 -05:00
Vincent Lee 46bff28dfc Fix #2253 2017-05-03 14:19:45 -05:00
Vincent Lee e0f3ba881d Fix #2254, #2228 2017-05-02 11:03:18 -05:00
Vincent Lee 04fc77b25f Bump forge to fix PIE issues. Closes #2091, unofficial repo #472 2017-05-01 18:34:45 -05:00
Vincent Lee 6a184f085d Fix #2250 2017-04-29 15:41:11 -05:00
Vasco Lavos 0162178263 Update contributors.properties 2017-04-29 19:28:47 +01:00
kid2407 79f9d1383d fixed two typos 2017-04-29 19:13:17 +02:00
Vasco Lavos 90e060de45 build 2017-04-27 16:56:43 +01:00
Vincent Lee 160a174677 Pass enchanter right clicks through to item when there's nothing to do. Closes #2244 2017-04-14 18:56:43 -05:00
Vincent Lee 982b31a764 A debug snuck in 2017-04-10 19:07:33 -05:00
Vincent Lee d98e775eb6 Make some rune recipes oredicted, closes #2235 2017-04-10 19:05:14 -05:00
Vincent Lee 187d74ac1e Fix #2243 2017-04-10 18:53:00 -05:00
Vincent Lee a0dfbe6524 Clean up wand code a bit. Closes #2239, closes #2215 2017-04-10 18:32:04 -05:00
Vincent Lee 8791db9b10 Merge pull request #2212 from codycoolwaffle/patch-1
Fixes #2207
2017-04-06 21:36:01 -05:00
Vasco Lavos cb3886659a Update contributors.properties 2017-04-01 20:04:31 +01:00
Vasco Lavos fd0b4323d9 Update contributors.properties 2017-03-27 21:24:15 +01:00
Vincent Lee ee2616579d Lexicon hud shows actual keybinding instead of shift, closes #2216 2017-03-24 11:39:45 -05:00
codycoolwaffle 3ea9ad8cb1 Fixes #2207
MC 1.9 changed the potion effect numbers, this is to accommodate with those changes.
2017-03-23 08:49:01 -07:00
Vincent Lee 25c24c0ab9 Fix #2208 mostly 2017-03-21 12:39:15 -05:00
Vincent Lee b444947c9a Fix #2209 mana burst visualization lag again 2017-03-20 22:57:06 -05:00
Vasco Lavos f9f56bd273 Update contributors.properties 2017-03-17 22:43:53 +00:00
Vincent Lee 78610b2d59 Fix animated torch not animating smoothly when toggled serverside (bursts and hourglass) 2017-03-17 11:18:32 -05:00
Vincent Lee 8529cd2ae9 Mod flowers bounding boxes now match their shift, like vanilla flowers 2017-03-16 19:57:34 -05:00
Vincent Lee 65cd429cb5 Clean out some unnecessary lines in blockstate jsons. smaller jsons are always a good thing 2017-03-14 19:13:02 -05:00
Vincent Lee 003bfa5c16 Make a blockstate json for animated torch to silence log errors, move item json to right place 2017-03-14 19:03:57 -05:00
Vincent Lee 886ed03510 Fix shimmering mushrooms popping off at strange times 2017-03-14 18:45:00 -05:00
Vincent Lee ea24ca751c Fix armor 'breathing' on armor stands. Closes #2191 2017-03-13 12:57:37 -05:00
Vincent Lee 751fe02072 Fix #2197 >_> 2017-03-12 14:05:10 -05:00
Vasco Lavos d760340da7 Merge branch 'master' of https://github.com/Vazkii/Botania 2017-03-12 10:35:10 +00:00
Vasco Lavos d5bd97b700 Fix the lexicon webpage looking for an en_US file that doesn't exist anymore. Closes #2196 2017-03-12 10:34:50 +00:00
Vasco Lavos 020f0a197f Update contributors.properties 2017-03-11 21:30:09 +00:00
Vasco Lavos 5320433dee build 342 2017-03-10 18:45:53 +00:00
Vasco Lavos 1a1620af41 AAAAAAAAAAAAAA 2017-03-10 18:39:05 +00:00
Vasco Lavos 86590d99ef Revert "Remove needless json files because predicates are cool"
This reverts commit 277fc1bca8.
2017-03-10 18:21:47 +00:00
Vasco Lavos 058e9dd6a4 These deps aren't required 2017-03-10 18:16:49 +00:00
Vasco Lavos 8ddce9b20c Update JEI 2017-03-10 18:11:15 +00:00
Vasco Lavos 277fc1bca8 Remove needless json files because predicates are cool 2017-03-10 18:03:47 +00:00
Vasco Lavos c2c09b30e8 Before I forget and ruin everything 2017-03-10 18:02:53 +00:00
Vasco Lavos 1a5262a659 Merge branch '1.11' 2017-03-10 18:01:37 +00:00
Vasco Lavos fa8d48b77b Build 341 2017-03-10 17:55:12 +00:00
Vasco Lavos 87283b7b9d Merge pull request #2186 from MCUpdater/master
Restrict ores from the ore dictionary to only those that are blocks.
2017-03-10 17:08:26 +00:00
Vincent Lee e2404988d4 Merge pull request #2189 from codewarrior0/patch-2
Fix Mana Enchanter only applying one enchanted book
2017-03-08 12:02:17 -06:00
David Vierra b0f0f85563 Fix Mana Enchanter only applying one enchanted book
`ench.func_191560_c` returns `true` if the two enchantments are mutually compatible.
2017-03-07 22:34:55 -10:00
Scott M. Barbour cd5f70c566 Restrict ores from the ore dictionary to only those that are blocks. 2017-03-05 23:18:32 -06:00
Vincent Lee 20c6388ed3 Remove unnecessary item drop fiddling. closes #2175, #2126 2017-03-04 14:51:02 -06:00
Vincent Lee b044c98051 Fix marimorphosis running clientside 2017-03-04 14:40:58 -06:00
Vincent Lee 63c93ebab4 Fix crystal bow not using mana, closes #2183 2017-03-01 13:40:03 -06:00
Vincent Lee f369c9ee55 Cleanup (corporea) spark interactions and invis flags. Closes #2179 2017-02-28 23:47:11 -06:00
Vincent Lee 4814fc6bde Fix rannuncarpus crash placing pistons, closes #2182 2017-02-28 19:50:22 -06:00
Vincent Lee 7a58166275 Fix weight lens spawning falling blocks too high, and spawn some fancy particles 2017-02-28 16:22:06 -06:00
Vasco Lavos 63e5c81a28 Update contributors.properties 2017-02-22 18:41:15 +00:00
Vincent Lee ba69be2f31 Make sparkle particles match 1.7 more closely (it's still a bit off >_>) 2017-02-20 23:43:42 -06:00
Vincent Lee 6e5f757518 Fix nullable annotation stuff + some stack nulls. Closes #2162 2017-02-20 23:04:37 -06:00
Vincent Lee 0d1324c45d Minor clean up ItemNBTHelper 2017-02-19 21:37:05 -06:00
Vincent Lee bf1b3a3aa9 Fix huge performance drop when simulating fake bursts. Closes #2174 2017-02-19 21:23:49 -06:00
Vincent Lee 14fea3891f Fix manual dropping of items, closes #2173 2017-02-19 18:31:47 -06:00
Vincent Lee 3cf1a606e9 Merge master 2017-02-19 00:18:43 -06:00
Vincent Lee 59a5921713 AoE mining now properly fires break events and drops xp. Closes #2171 2017-02-19 00:09:21 -06:00
Vincent Lee c722443dc2 More tool cleaning 2017-02-18 23:34:37 -06:00
Vincent Lee 3c80b25277 Minor cleanups in tools 2017-02-18 23:00:50 -06:00
Vincent Lee 87484f0db3 Fix bad armor values, closes #2166 2017-02-18 20:45:02 -06:00
Vincent Lee 7cd3fc826f Fluxfield uses FE instead of RF, delete RF api files. Closes #2117 2017-02-18 20:31:33 -06:00
Vasco Lavos 4abb66a9d9 Update contributors.properties 2017-02-13 20:08:30 +00:00
Vincent Lee 6627ca091d Fix marimorphosis running clientside 2017-02-13 13:10:15 -06:00
Vincent Lee de99548229 Merge master 2017-02-13 12:37:37 -06:00
Vincent Lee f9974d77a0 Remove lexicon references to thatch and reed blocks, closes #2157 2017-02-07 19:50:50 -06:00
Vasco Lavos 687772bb9a Update contributors.properties 2017-02-06 16:44:06 +00:00
Vincent Lee 13bbb7779b Fix some things not being rendered fullbright 2017-02-04 19:50:59 -06:00
Vincent Lee 02e2c2500a Fix more stack nulls in enchanter 2017-02-04 19:39:07 -06:00
Vincent Lee ee0740b2bb Fix missing particles/last recipe messages for runic altar 2017-02-04 14:02:39 -06:00
Vincent Lee 6d97e48de5 Fix soulscribe not dealing extra damage due to a 1.9 porting error. Closes #2148 2017-01-30 21:58:35 -06:00
Vincent Lee 02b4a25e70 Dear past self: don't try clever tricks that don't actually work and probably run slower. Closes #2111 2017-01-30 21:32:25 -06:00
Vincent Lee a7d92d5451 Fix durability bars for 1.11 2017-01-29 22:29:37 -06:00
Vincent Lee 419d8c9753 A few more spots I missed in b76f9d4 2017-01-28 16:11:37 -06:00
Vincent Lee ec930b3249 Fix banner lexicon pages not showing bc they thought they still needed Et Futurum 2017-01-28 12:35:21 -06:00
Vincent Lee 158026d097 Modernize GG teleport code 2017-01-28 10:56:39 -06:00
Vincent Lee abb0dc4393 Update GoG to 1.11 2017-01-23 18:05:30 -06:00
Vincent Lee 74dbd5cc85 Fix loader checks using uppercase modids 2017-01-23 17:22:12 -06:00
Vincent Lee b7fa6abf2b Fix my 'GG looks like you' feature not working on dedi servers 2017-01-23 16:52:05 -06:00
Vincent Lee e72028fa6d Fix GG not having a proper name on dedicated servers 2017-01-23 16:48:28 -06:00
Vincent Lee 1abf5186d5 Fix acheivements not working 2017-01-23 15:47:54 -06:00
Vincent Lee ef459e9468 Initialize GG AI in the right place 2017-01-23 15:37:36 -06:00
Vincent Lee e707ce1330 Simplify GG handling of music 2017-01-23 15:36:12 -06:00
Vincent Lee 8dc94ba27c Fix oninitialspawn not being called in some places e.g. guardian fight, so local difficulty wouldn't be considered. 2017-01-23 15:23:53 -06:00
Vincent Lee 1671435c0c Not sure how these ended up here 2017-01-23 13:11:47 -06:00
Vincent Lee 888a8fd19b Cocoon may now spawn something else 2017-01-23 12:56:26 -06:00
Vincent Lee 4e9109f9bd Remove golden laurel in favour of vanilla totem 2017-01-23 11:48:41 -06:00
Vincent Lee 9017e6ad85 More assorted stack fixes and cleanups 2017-01-22 20:36:41 -06:00
Vincent Lee e733aa9a2f Grass seeds run less logic clientside 2017-01-22 20:02:50 -06:00
Vincent Lee 617657e5f8 Fix the apothecary particles 2017-01-22 19:56:11 -06:00
Vincent Lee 07dd92ed6a Fix apothecary desync/not working in general, and the last recipe message not showing 2017-01-22 19:49:28 -06:00
Vincent Lee 03b3091e3e Fix apothecary not updating immediately when vining it 2017-01-22 19:44:16 -06:00
Vincent Lee 2ba80d0541 Merge master 2017-01-22 18:27:54 -06:00
Vasco Lavos a11fdadba2 build 340 2017-01-21 17:43:51 +00:00
Vasco Lavos 4d8039a76a Compiling is good. 2017-01-21 16:58:58 +00:00
Vasco Lavos 3013253c90 Fixed the Crafty Crate destroying items if there's a block under it. 2017-01-21 16:57:41 +00:00
Vasco Lavos f67e6f8209 Fixed the Key of the King's Law stacking portals together if the player is looking straight down. Closes #2122 2017-01-21 16:53:09 +00:00
Vasco Lavos 86bdfaa186 Fixed the livingwood bow not using 1.9 arrow priority and using arrows even if they have infinity. 2017-01-21 16:41:34 +00:00
Vasco Lavos c5a00ba542 The Mana Enchanter now accepts floating flowers. Closes #2137 2017-01-21 16:35:07 +00:00
Vasco Lavos 30401e2415 Fixed crash on unequipping the Ring of Loki. 2017-01-21 16:32:20 +00:00
Vasco Lavos 0786e9d43f Who told you you could change mappings? :v 2017-01-21 16:25:49 +00:00
Vasco Lavos 2bed6568fe Merge branch 'master' of https://github.com/Vazkii/Botania 2017-01-21 16:23:55 +00:00
Vasco Lavos 8139acc8bf Fixed the Ring of Loki checking your offhand item and thus negating the cursor addition if you have no item in either hand. Closes #2136 2017-01-21 16:23:26 +00:00
Vasco Lavos 14b6eb41f5 Merge pull request #2101 from williewillus/fix-1999
Fix #1999
2017-01-21 16:15:15 +00:00
Vincent Lee b04d6bbefa A couple more nulls 2017-01-16 14:29:16 -06:00
Vincent Lee 6d85ef225b Fix gourmaryllis spamming packets, closes #2133. They also now give an auditory cue when they are ready to accept another piece of food 2017-01-16 14:13:20 -06:00
Vincent Lee 66420044a7 Fix terra plate not playing particles. Closes #2124 2017-01-11 10:09:33 -06:00
Vincent Lee 7fbefda848 Fix inconsistencies in life imbuer vs vanilla mob spawner. closes #2040 2017-01-10 09:35:58 -06:00
Vincent Lee ec94aa640d Fix bad param name 2017-01-09 14:54:41 -06:00
Vincent Lee 348e82bbee Minor cleanup in bh talisman 2017-01-09 14:44:12 -06:00
Vincent Lee 88d2534d19 More nulls, of a different kind 2017-01-09 14:28:33 -06:00
Vincent Lee f892297bf3 Fix corporea crystal cube crash 2017-01-09 14:10:11 -06:00
Vincent Lee b76f9d4e8f Replace IInventory baubles with IItemHandler where appropriate 2017-01-09 14:02:40 -06:00
Vincent Lee 19e16863f1 Uppercase the modname 2017-01-09 13:48:12 -06:00
Vincent Lee ec8bcfcc2e Fix block rods consuming the rod 2017-01-09 13:39:24 -06:00
Vincent Lee af13e55dc5 Fix more nulls in recipes 2017-01-09 13:27:27 -06:00
Vincent Lee 758f58f692 Adapt apothecary to fluid cap changes 2017-01-08 15:53:50 -06:00
Vincent Lee 97004462d6 Fix dodge packet beign registered twice 2017-01-08 15:03:49 -06:00
Vincent Lee e0b23930aa Fix null in will application 2017-01-08 15:01:15 -06:00
Vincent Lee 6ff9f5e510 I can has autocomplete?? 2017-01-08 14:46:07 -06:00
Vincent Lee 4d1a15c8bb More nulls! (halo) 2017-01-08 14:45:32 -06:00
Vincent Lee 634cff1a62 Fix spectrolus not showing particles 2017-01-08 14:35:54 -06:00
Vincent Lee 5ead942f68 Change VanillaPacketDispatcher to not rerender the block every sync 2017-01-08 14:17:32 -06:00
Vincent Lee 2d615eae19 Even more nulls 2017-01-08 14:04:49 -06:00
Vincent Lee d17b7b57f3 Fix entity names 2017-01-08 12:09:09 -06:00
Vincent Lee 811c0d1993 Fix a bunch more null issues 2017-01-08 11:52:53 -06:00
Vincent Lee fa2533a4f1 Resolve some todos 2017-01-07 12:48:35 -06:00
Vincent Lee c2158eb3b0 Modernize ToolCommons.raytrace 2017-01-07 12:30:39 -06:00
Vincent Lee 3aba77a4eb Remove unused render class 2017-01-07 12:16:22 -06:00
Vincent Lee de896428cf Fix virus, and fix all zombie horses being immortal when Botania is installed 2017-01-07 12:05:18 -06:00
Vincent Lee 957daedcb7 Bump forge ver 2017-01-07 11:21:35 -06:00
Vincent Lee 1bc6d5ade0 Fix brewery not playing particles when it finishes 2017-01-05 15:41:31 -06:00
Vincent Lee 7af2a3683e Some cleanups, removing some setdeads where the item would kill itself anyway 2017-01-05 15:18:07 -06:00
Vincent Lee 0e6951ee53 Same as previous commit but for the sounds 2017-01-05 09:55:18 -06:00
Vincent Lee 74e38627c5 In all blockstate/model jsons, refer explicitly to lowercase names in case mojang decides to be strict about this in the future >.< 2017-01-05 09:44:50 -06:00
Vincent Lee 0db7134813 Fix flower bag gui not showing shadow stacks 2017-01-05 09:35:53 -06:00
Vincent Lee c47923b90b Readd a null that's still needed, fix vine ball splatting in your face when you throw it 2017-01-05 09:24:08 -06:00
Vincent Lee 6e5952e36b Fix special flower rendering 2017-01-05 09:12:21 -06:00
Vincent Lee 34181c213d Fix init not being called on proxy :P 2017-01-05 09:10:04 -06:00
Vincent Lee 6312bddbb2 Rename all non lowercase resources (huge diff) 2017-01-05 09:07:04 -06:00
Vincent Lee b754d801b4 More nulls! 2017-01-05 04:40:21 -06:00
Vincent Lee 8475462cae Bump pack.mcmeta and fix langs 2017-01-05 04:19:01 -06:00
Vincent Lee 024a065799 Couple more stack nulls 2017-01-05 04:05:01 -06:00
Vincent Lee 4a3e0fd636 A bunch more null fixes 2017-01-05 03:59:01 -06:00
Vincent Lee 24779ded1c Ton of null fixes 2017-01-05 03:44:13 -06:00
Vincent Lee a87dd1d46b Remove BC api that's failing to compile and disable integration in the mod, until it gets updated 2017-01-05 02:35:37 -06:00
Vincent Lee 461ac4aab5 Fix starfield tesr, whole thing compiling lmao 2017-01-05 02:31:21 -06:00
Vincent Lee 641dc80490 All items compiling 2017-01-05 02:16:04 -06:00
Vincent Lee d1ba09bf89 Whole block pkg compiling 2017-01-05 01:23:52 -06:00
Vincent Lee 3552154c24 Decor and subtile 2017-01-05 01:16:13 -06:00
Vincent Lee a8558ea9a1 Compiles corporea dispenser mana and string block subpkgs 2017-01-05 01:11:09 -06:00
Vincent Lee 44a8fe17eb Compiles base block 2017-01-05 01:02:50 -06:00
Vincent Lee d4db9902e3 Compiles in entity 2017-01-05 00:49:56 -06:00
Vincent Lee d27cdbebed Compiles in core, crafting, lexicon, world subpkgs 2017-01-05 00:35:38 -06:00
Vincent Lee 2e4374bb46 Client stuff, fix all JEI stuff 2017-01-05 00:26:04 -06:00
Vincent Lee c0811f5a78 api compiles, bump version 2017-01-04 23:45:48 -06:00
Vincent Lee e730c2154d client.model spackage 2017-01-04 23:38:07 -06:00
Vincent Lee ee4ebde69e All entity renders and TESR's, except starfield 2017-01-04 23:35:06 -06:00
Vincent Lee c30035ed06 getSubBlocks and Creative tab 2017-01-04 23:26:40 -06:00
Vincent Lee 355da3997e Nonnulllist in recipes and getSubItems 2017-01-04 23:20:32 -06:00
Vincent Lee 294a0b1879 Update buildscript 2017-01-04 23:10:42 -06:00
Vincent Lee 3c3f1c18f1 Fix reflection names 2017-01-04 11:28:45 -06:00
Vincent Lee 685917dd32 Get rid of extra semicolons 2017-01-02 14:57:08 -06:00
Vincent Lee e51a60fbea Make getTileEntity safe from getActualState and getExtendedState, closes #1999 2017-01-02 14:55:11 -06:00
Vincent Lee 7321f50d39 Update mappings to stable_29 for 1.10.2, no functional changes 2017-01-02 12:24:45 -06:00
Vasco Lavos f51b3bdbb2 Update contributors.properties 2016-12-05 11:24:39 +00:00
Vasco Lavos b5d561d7d0 Update contributors.properties 2016-12-03 20:01:12 +00:00
Vasco Lavos 8aac740b77 Build 339 2016-11-20 17:05:10 +00:00
Vasco Lavos 7d97dd8ae6 Merge pull request #2038 from nano001/master
update en_US.lang
2016-11-20 16:59:44 +00:00
Vasco Lavos 684e8db7d6 Fixed a crash if a burst from a Manastorm Charge hits a mana container block. Closes 2041 2016-11-20 16:59:39 +00:00
Vasco Lavos 15a0ae0d21 Fixed a potential crash when crafting with baubles. Closes #2037 2016-11-20 16:55:43 +00:00
Vasco Lavos 66a2ef509e Fixed bad garden of glass download on the site. Redirect to curseforge instead. 2016-11-17 15:20:59 +00:00
nano_001 8260bbc77b update en_US.lang
fix page of "Brew of Crimson Shade" in Lexica Botania
2016-11-16 20:17:29 +09:00
Vasco Lavos a7e75b6254 Build 338 2016-11-14 23:13:45 +00:00
Vasco Lavos 550e3458d1 Merge branch 'master' of https://github.com/Vazkii/Botania 2016-11-14 23:07:46 +00:00
Vasco Lavos 3d3aee2ebc Fixed a crash when breaking redstone ore with an Elementium Pickaxe or Terra Shatterer with Elementium tips. 2016-11-14 23:07:33 +00:00
Vasco Lavos e8718331af Merge pull request #2029 from nano001/lang-update
update ja_JP.lang
2016-11-14 23:06:13 +00:00
Vasco Lavos c9358d2d3f Merge pull request #2014 from shadowfacts/master
Allow inserting elven lexica into the portal
2016-11-14 23:06:06 +00:00
Vasco Lavos 00896bebb8 Fixed a crash when using the Worldshaper's Astrolabe without a block set. Closes #2019 2016-11-14 23:05:52 +00:00
nano_001 63e9f81f41 update ja_JP.lang 2016-11-11 21:53:30 +09:00
Shadowfacts 739f22ee05 Allow inserting elven lexica into the portal 2016-11-04 10:37:13 -04:00
Vasco Lavos 0aac583429 build 2016-11-01 19:02:36 +00:00
Vasco Lavos b3eec11f00 Fixed a client crash with the Worldshaper's Astrolabe. Closes #2003 2016-11-01 18:32:58 +00:00
Vasco Lavos 270edf5b23 WHO THOUGHT HAVING A CLIENT ONLY CONSTRUCTOR WAS A GOOD IDEA!?!?! Closes #2002 2016-11-01 18:30:26 +00:00
Vasco Lavos 1e55d1b2df Garden of Glass's sea level is now set to 64 during world creation. As of 1.8, the sea level is set to a really low value for flat chunk providers, so this fixes squids not spawning in garden of glass worlds. Closes #2001 2016-11-01 18:25:55 +00:00
Vasco Lavos a1993a10c8 Belated build 2016-11-01 18:21:16 +00:00
Vasco Lavos f11cc4a2ed use rune of spring instead 2016-10-31 21:21:06 +00:00
Vasco Lavos b27f7948bd charm docs 2016-10-31 19:52:23 +00:00
Vasco Lavos 174213b6ad You know what, let's have fun instead. 2016-10-30 22:21:59 +00:00
Vasco Lavos 79e7401cec Disabled the flugel tiara secret thing 2016-10-30 21:25:56 +00:00
Vasco Lavos a7aa491e14 Trim unused sprites and metadata 2016-10-30 21:21:09 +00:00
Vasco Lavos 13fade4501 Let's try 100 2016-10-30 21:04:37 +00:00
Vasco Lavos e1957b9cf1 Benevolent Goddess' Charm 2016-10-30 20:58:30 +00:00
Vasco Lavos 0e2f6cb669 Mana Pumps will now output a comparator signal if they're turned off. Closes #1997 2016-10-30 18:12:33 +00:00
Vasco Lavos f02292370e Minecarts with Mana Pools now have the correct amount of drag. Closes #1998 2016-10-30 17:51:13 +00:00
Vasco Lavos d871cea207 Fixed the astrolabe not working because I'm a derp 2016-10-30 17:49:18 +00:00
Vasco Lavos 07815a6c10 yes this too 2016-10-30 17:26:49 +00:00
Vasco Lavos 69dce1cb27 Remove the age cap from the dandelifeon. Implement a "producing age" cap instead. 2016-10-30 17:25:45 +00:00
wiiv 3de77428d1 new flower 2016-10-29 23:04:48 +01:00
Vasco Lavos 3b5f4b89a1 Astrolabe recipe/docs and hud 2016-10-29 22:32:51 +01:00
Vasco Lavos 9a0440f38a Merge branch 'master' of https://github.com/Vazkii/Botania 2016-10-29 22:06:03 +01:00
Vasco Lavos f332c001b7 Astrolabe mana cost 2016-10-29 21:56:05 +01:00
Vasco Lavos b6ca153c21 Merge pull request #1979 from nano001/lang-update
update ja_JP.lang
2016-10-29 21:52:59 +01:00
Vasco Lavos fe01b421e7 Added grass paths, farmland and botania alt grasses to the blocks that can be dug for pebbles in garden of glass. Closes #1989 2016-10-29 21:52:59 +01:00
Vasco Lavos 11cc1b2767 Added a mana alchemy recipe for chorus flowers 2016-10-29 21:49:32 +01:00
Vasco Lavos c3242dfe98 Bunch of dandelifeon changes. Indirectly fixes #1987 2016-10-29 21:27:09 +01:00
Vasco Lavos 6e9ead7e58 Fixed log spam by the loonium. Closes #1988 2016-10-29 21:10:36 +01:00
Vasco Lavos 320eea1b6c Updated the Gourmaryllis' documentation to be clearer. Closes #1980 2016-10-29 21:09:51 +01:00
Vasco Lavos bca9d6e7fa Fixed Resolute Ivy not working. Closes #1991 2016-10-29 21:06:25 +01:00
Vasco Lavos 936f02ffc9 Fixed the invisibility cloak not using up mana properly. Closes #1992 2016-10-29 20:52:39 +01:00
Vasco Lavos 5c3a2c700b More astrolabe stuff 2016-10-27 19:09:16 +01:00
Vasco Lavos 147c32d657 WIP astrolabe 2016-10-26 23:33:45 +01:00
Vasco Lavos 8e06d5a977 Merge branch 'master' of https://github.com/Vazkii/Botania 2016-10-26 23:33:06 +01:00
Vasco Lavos 7d8ad3208b I AM GOOD AT COMITTING BUILDS IN TIME YES 2016-10-26 23:32:33 +01:00
nano_001 0b92a40887 update ja_JP.lang 2016-10-27 00:00:00 +09:00
wiiv 8dc4523a19 abacus 2016-10-25 11:04:45 +01:00
Vasco Lavos 22d6f74a9f Merge branch 'master' of https://github.com/Vazkii/Botania 2016-10-24 19:26:44 +01:00
Vasco Lavos 16ba6a4aba The Lexica Botania now autodetects your max gui scale and sets its allowed scale values accordingly. Closes #1978 2016-10-24 19:26:34 +01:00
Vasco Lavos c3212bb181 Merge pull request #1976 from iPencil/master
Fixed aoe tool referencing already removed tileEntity
2016-10-24 19:07:25 +01:00
CreeperShift 0b951a8c9a Fixed aoe tool broken blocks losing nbt data
References an already deleted tileEntity causing the item to not have
the required nbt tag.
2016-10-24 04:58:46 +02:00
wiiv dc863b22a0 another trio 2016-10-23 22:49:30 +01:00
wiiv c2eeed5828 Look at the stars Steve... or just build something, IDK. 2016-10-23 17:32:33 +01:00
Vasco Lavos af0b1b8bff Build 334 2016-10-23 16:45:23 +01:00
Vasco Lavos 08e16288e2 Fixed the teru teru bozu not resetting the rain time. 2016-10-23 16:23:53 +01:00
Vasco Lavos f244affcaa Fixed the floating flower caching log not formatting. Closes #1968 2016-10-23 16:15:51 +01:00
Vasco Lavos 893683050a Added a config option to disable shedding entirely. This improves load times by not checking every mob. Closes #1969 2016-10-23 16:14:08 +01:00
Vasco Lavos a8ef846e6b ffs 2016-10-23 15:52:00 +01:00
Vasco Lavos 493a40d3c9 The /botania-download-latest command can now be ran on singleplayer without cheats enabled. Closes #1971 2016-10-23 15:51:27 +01:00
Vasco Lavos 97d98bd01c Potato memes > bugfixes 2016-10-22 22:55:46 +01:00
Vasco Lavos 40775ba56b The Manasteel and Elementium shovels can now make grass paths like vanilla shovels can. They can turn grass paths into farmland now. 2016-10-22 22:48:41 +01:00
Vasco Lavos 3bd50bc724 Third eye recipe/docs 2016-10-22 22:44:28 +01:00
Vasco Lavos a2ec9f88b9 blarg 2 2016-10-22 22:24:30 +01:00
Vasco Lavos 508b71a95f Third Eye. 2016-10-22 22:22:11 +01:00
Vasco Lavos 2df0b7995b Merge branch 'master' of https://github.com/Vazkii/Botania 2016-10-22 19:25:52 +01:00
Vasco Lavos 18623e64df Recipe/docs for the cloud amulets 2016-10-22 19:25:46 +01:00
wiiv 733b1dc910 Explosive Charms. 2016-10-22 19:13:41 +01:00
Vasco Lavos 67fc55248e blarg 2016-10-22 18:26:45 +01:00
Vasco Lavos b0fe481886 Cloud amulets 2016-10-22 18:25:51 +01:00
Vasco Lavos 682bd491f1 You can no longer summon a Guardian of Gaia if there's already one nearby. 2016-10-22 16:38:11 +01:00
Vasco Lavos 39bf519f57 The Loonium now spawns mobs that drop dungeon loot instead of spawning dungeon loot outright. 2016-10-22 14:11:42 +01:00
Vasco Lavos 5f56dfb511 Mana Bursts that have been teleported by a Warp Lens can no longer deliver mana to receiving blocks. 2016-10-22 12:51:43 +01:00
Vasco Lavos 7fbaea8d1e Invis cloak recipe/docs 2016-10-22 12:29:59 +01:00
Vasco Lavos e7499424d6 Invisibility Cloak 2016-10-22 12:13:58 +01:00
Vasco Lavos 82435d43b7 The Corporea Retainer recipe now uses chestWood 2016-10-22 11:44:21 +01:00
Vasco Lavos a0dad16711 Merge pull request #1962 from InsomniaKitten/oredict
Use the ore dictionary for chests in the Bauble Box recipe.
2016-10-21 23:42:02 +01:00
Vasco Lavos 4f6d91ba78 Merge pull request #1960 from 3TUSK/zh_CN
Update zh_CN.lang
2016-10-21 23:41:49 +01:00
InsomniaKitten 7fb0b7c855 Use the ore dictionary for chests in the Bauble Box recipe. 2016-10-20 09:49:48 +01:00
3TUSK 57537588a3 Update zh_CN.lang 2016-10-19 23:00:41 -04:00
Vasco Lavos b5f5557f3e Build 333 2016-10-19 22:35:15 +01:00
Vasco Lavos a36ab00c0a Fixed mana tablets and mirrors not having their insides colorized properly. Closes #1957 2016-10-19 22:18:03 +01:00
Vasco Lavos 97d8e03dc3 SAVE YOUR WORK BEFORE COMMITING YOU GOD DAMN MORON 2016-10-19 22:10:40 +01:00
Vasco Lavos 978ec66d12 Added a mana infusion recipe for beetroot seeds. Closes #1956 2016-10-19 22:08:51 +01:00
Vasco Lavos 8306a38d83 Added osmium from mekanism and black quartz from actually additions to the botania api orechid table. 2016-10-19 22:06:34 +01:00
Vasco Lavos 4f708e965f Updated the reset step height for the sashes to the new step height in 1.8+. Fixes them breaking stairs made with chisels and bits. Closes #1947 2016-10-19 20:36:20 +01:00
Vasco Lavos 0085bc2415 Fixed a crash when mana pools are broken or removed from the world. Actually has to do with a bug in forge, so this is a bit of a band aid. Closes #1950 2016-10-19 20:34:01 +01:00
Vasco Lavos ba049f8b45 Merge branch 'master' of https://github.com/Vazkii/Botania 2016-10-19 20:20:50 +01:00
Vasco Lavos 751ce655ba Fixed the golden laurel crown destroying your amulet slot item rather than itself. Closes #1954 2016-10-19 20:20:05 +01:00
wiiv 2603d6d646 New Baubles. 2016-10-18 20:04:02 +01:00
wiiv f3a60d434d Is this is? 2016-10-16 20:08:35 +01:00
Vasco Lavos cbac610fb4 another build hell yeah 2016-10-14 22:40:51 +01:00
Vasco Lavos b94b534262 Fixed the manaseer monocle not working after changing its slot 2016-10-14 22:32:15 +01:00
Vasco Lavos 2721857093 Build 331 2016-10-14 22:27:53 +01:00
Vasco Lavos 836d6959ed Sylph wings now glow 2016-10-14 21:49:41 +01:00
Vasco Lavos 093f258949 Cloak of balance! 2016-10-14 21:48:23 +01:00
wiiv 55bbd6da62 2x 3x Jump. 2016-10-14 19:53:36 +01:00
Vasco Lavos 3a816ece7a Merge branch 'master' of https://github.com/Vazkii/Botania 2016-10-14 19:20:47 +01:00
Vasco Lavos d575eb6043 Fixed the Key of the King's Law producing a bad shape when looking northeast. Closes #1930 2016-10-14 19:20:32 +01:00
Vasco Lavos 8c2b282f89 Merge pull request #1910 from Flaxbeard/master
Added ManaProficiencyEvent and reworked IManaProficiencyArmor
2016-10-14 19:09:18 +01:00
Vasco Lavos 3dfebeba01 Merge pull request #1911 from Flaxbeard/rework_discount
Reworked getFullDiscountForTools and ManaDiscountEvent
2016-10-14 19:09:13 +01:00
Vasco Lavos b53aba89c5 Merge pull request #1936 from ArukaAlter/patch-1
Update pt_BR.lang
2016-10-14 19:08:23 +01:00
Vasco Lavos a10f6451f3 Merge pull request #1935 from nano001/lang-update
Update ja_JP.lang
2016-10-14 19:08:21 +01:00
Vasco Lavos 9e38727bde Merge pull request #1912 from NatsuArashi/patch-4
Update zh_TW.lang
2016-10-14 19:08:19 +01:00
Vasco Lavos cc648f2372 Fixed the Kindle lens not being able to close nether portals. 2016-10-14 19:07:37 +01:00
Vasco Lavos 8969fcf3a6 Fixed Infrangible Platforms being able to be exploded. 2016-10-14 18:54:01 +01:00
Vasco Lavos 93fd114e9b Right 2016-10-14 18:43:37 +01:00
Vasco Lavos f684ebc80d Added a null check to the Thorn Chakram to prevent it from crashing if the entity that threw it is unloaded. Closes #1944 2016-10-14 18:36:21 +01:00
Vasco Lavos ee96f3366d Fixed munchdews eating leaves below them. Closes #1941 2016-10-14 18:32:15 +01:00
Vasco Lavos c6a7be61a2 Fixed the bauble box GUI not removing the bauble icons for the new slots. Closes #1937 2016-10-14 18:16:13 +01:00
Vasco Lavos 8f3144cfc6 Merge branch 'master' of https://github.com/Vazkii/Botania 2016-10-14 18:14:41 +01:00
Vasco Lavos b692f55237 Implemented a workaround for Azanor/Baubles#156 2016-10-14 18:14:21 +01:00
Vasco Lavos 8be7de01e4 Update contributors.properties 2016-10-14 17:36:42 +01:00
Vasco Lavos a3dd76f081 Another build because I'm a derp 2016-10-11 23:50:53 +01:00
Vasco Lavos 806b324d81 Fixed some baubles not working after their slots were changed. 2016-10-11 23:40:48 +01:00
Patric Alexandre f99f213af7 Update pt_BR.lang 2016-10-11 15:57:53 -03:00
Vasco Lavos f8688ef471 Build 329 2016-10-11 19:18:25 +01:00
Vasco Lavos 84e5307973 Buffed the Great Fairy Ring's chance to spawn a pixie by a bunch. 2016-10-11 19:04:16 +01:00
Vasco Lavos 4ae02360ee Changed bauble slots around. 2016-10-11 18:38:17 +01:00
Vasco Lavos 9da1f7d6a1 Use GL11.glPopAttrib in the hourglass render. Should fix #1905 2016-10-11 18:21:22 +01:00
Vasco Lavos 12112b3a65 Fixed lexica gui elements breaking if you rescale it with the new button. Closes #1918 2016-10-11 18:18:50 +01:00
Vasco Lavos 17564633c3 Fixed Luminizers. Closes #1920 2016-10-11 17:57:50 +01:00
Vasco Lavos e143629f5a Don't really need 9, 8 works. 2016-10-11 17:49:12 +01:00
Vasco Lavos 5ad34dd097 Hard dep on the latest baubles. 2016-10-11 17:46:17 +01:00
Vasco Lavos 39cf3e2744 Updated experience equation for 1.8+. Closes #1931 2016-10-11 17:44:24 +01:00
wiiv 5f8dda2e29 New cloak(s). 2016-10-11 17:05:32 +01:00
Vasco Lavos 4d9f300087 Updated for the new version of baubles. Runs, not done yet. 2016-10-11 16:28:05 +01:00
nano_001 7fba8cf86f update ja_JP.lang 2016-10-11 22:39:17 +09:00
Vasco Lavos 589b3320f9 Build 328 2016-10-06 18:39:31 +01:00
Vasco Lavos 88a83d037e The Lexica Botania now detects if it's in an Akashic Tome and updates its display name (in the cover and landing page) accordingly. 2016-10-06 18:33:27 +01:00
Vasco Lavos 4d46b6b05a Fixed Hydroangeas not being passive. Closes #1914 2016-10-06 18:13:00 +01:00
NatsuArashi 5c20346149 Update zh_TW.lang
new lexiconcover
2016-10-05 21:53:31 +08:00
Flaxbeard fc5d794b79 Fixed manasteel helmet not implementing new version of getDiscount 2016-10-04 23:11:18 -05:00
Flaxbeard ab4b7b9e76 Added default body to the deprecated getDiscount method to fix some errors being thrown 2016-10-04 22:31:14 -05:00
Flaxbeard 5157c646f7 Revert "Added ManaProficiencyEvent and reworked IManaProficiencyArmor to work on a per-rod basis"
This reverts commit 504187dc5d.
2016-10-04 22:26:17 -05:00
Flaxbeard ef3dceccc6 Revert "Updated package-info.java"
This reverts commit ca6361af2d.
2016-10-04 22:26:09 -05:00
Flaxbeard 3f90dd940a Revert "Updated rods so they don't sue the deprecated methods"
This reverts commit a63cbf44f6.
2016-10-04 22:26:01 -05:00
Flaxbeard b98af839fe Reworked getFullDiscountForTools to allow armor sets (or subscribers to ManaDiscountEvent) to adjust mana discount based on the item in use 2016-10-04 22:24:36 -05:00
Flaxbeard a63cbf44f6 Updated rods so they don't sue the deprecated methods 2016-10-04 22:21:40 -05:00
Flaxbeard ca6361af2d Updated package-info.java 2016-10-04 22:21:40 -05:00
Flaxbeard 504187dc5d Added ManaProficiencyEvent and reworked IManaProficiencyArmor to work on a per-rod basis 2016-10-04 22:21:39 -05:00
Flaxbeard 6a57c87a1a Updated rods so they don't sue the deprecated methods 2016-10-04 22:20:41 -05:00
Flaxbeard 21db152022 Updated package-info.java 2016-10-04 22:04:42 -05:00
Flaxbeard 881fb84211 Merge remote-tracking branch 'origin/master' 2016-10-04 21:56:39 -05:00
Flaxbeard c4c409dc1f Added ManaProficiencyEvent and reworked IManaProficiencyArmor to work on a per-rod basis 2016-10-04 17:48:21 -05:00
Vasco Lavos 7c5159e76e Add .exe to the exclusion list for building the jar 2016-10-04 20:06:57 +01:00
Vasco Lavos 7830137c37 Build 327 2016-10-03 22:58:30 +01:00
Vasco Lavos 531d233b63 Removed Mana Powder from the Hydroangeas recipe. 2016-10-03 22:47:46 +01:00
Vasco Lavos 457f2d1e91 Build 326 (kinda late) 2016-10-03 22:46:54 +01:00
Vasco Lavos e75ae7b30c Stripped metadata from sprites. Smaller filesize! 2016-10-02 21:36:54 +01:00
Vasco Lavos e38556d265 Cleanup. Looks like it's been a while since this was run eh? 2016-10-02 21:29:35 +01:00
Vasco Lavos e862939b7b Recipe/docs for the tripwire lens 2016-10-02 20:27:33 +01:00
Vasco Lavos aacec4336a Change the gourmaryllis up bound up a bit. 2016-10-02 19:35:07 +01:00
Vasco Lavos d84952089f Tripwire lens 2016-10-02 19:27:51 +01:00
wiiv b55f66af8c You be trippin'. 2016-10-02 02:01:21 +01:00
Vasco Lavos 6f99b2fd6c Messenger lens 2016-10-01 22:26:20 +01:00
Vasco Lavos 6c3ff3487e New luminizer docs 2016-10-01 20:20:58 +01:00
Vasco Lavos a26436e295 Fixed the command to download the mod ingame not working 2016-10-01 13:33:07 +01:00
Vasco Lavos b4e42c861a Implement the new luminizers 2016-10-01 13:25:40 +01:00
Vasco Lavos 3c6f38bdf2 Added an upper bound to the Gourmaryllis. 2016-10-01 11:39:31 +01:00
wiiv 2dedc972ca Messenger Lens 2016-09-29 22:36:13 +01:00
Vasco Lavos 1ea189c105 Preliminary work for the luminizer expansion. To be continued. 2016-09-29 22:31:29 +01:00
Vasco Lavos 50ad1301d7 Hourglass render smoothening and addition of Mana Powder to make it a counter. 2016-09-29 22:04:23 +01:00
Vasco Lavos 87266364c8 Implemented wiiv's new cloak models. Also fixed render issues regarding them and the flugel tiara. 2016-09-29 21:06:53 +01:00
Vasco Lavos f6653b40be Fixed the Thorn Chakram not rendering. Removed some TODOs. 2016-09-29 19:49:21 +01:00
Vasco Lavos a87912c727 Added defaults to some switches to remove compile warnings. 2016-09-29 19:40:20 +01:00
Vasco Lavos 790f9fb120 Fixed a dupe with the flower pouch. 2016-09-29 19:00:04 +01:00
Vasco Lavos 26f24d47fd Recipe/docs for the animated torch 2016-09-29 18:59:39 +01:00
wiiv 611fec280b New floating flower models and new cloak model. 2016-09-29 00:33:32 +01:00
Vasco Lavos d46db2943c Animated Torch. 2016-09-28 20:32:15 +01:00
Vasco Lavos c6f9ecb5f9 Build 235 2016-09-27 23:08:08 +01:00
Vasco Lavos 4df25eb5ed Merge pull request #1893 from Flaxbeard/master
Added ManaItemsEvent
2016-09-27 22:12:11 +01:00
Flaxbeard 92f758adb7 Updated bracketing style and package-info.java 2016-09-27 15:14:54 -05:00
Vasco Lavos 4c3f48feb1 Fixed a crash when picking up a flower that was removed. Closes #1896 2016-09-27 19:09:17 +01:00
Vasco Lavos 9fdca60e8b Merge branch 'master' of https://github.com/Vazkii/Botania 2016-09-27 19:06:50 +01:00
Vasco Lavos a5afff3082 Fixed the rafflowsia being able to eat itself. Closes #1897 2016-09-27 19:06:37 +01:00
Vasco Lavos 8d4e9c204b Update contributing.md 2016-09-27 19:03:02 +01:00
Vasco Lavos cb18849104 Build 324 2016-09-24 21:00:44 +01:00
Vasco Lavos 4c7cb9c33c Change a quick thing here 2016-09-24 18:29:20 +01:00
Vasco Lavos 49d2c36f72 Added recipes for prismarine and prismarine crystals if you're in garden of glass. 2016-09-24 18:26:47 +01:00
Flaxbeard baa9d61af0 Added ManaItemsEvent 2016-09-23 19:18:05 -05:00
Vasco Lavos 2163f91cb2 Build 323 2016-09-23 01:07:07 +01:00
Vasco Lavos 61edcc43f0 Fixed packets having conflicting IDs 2016-09-22 23:50:27 +01:00
Vasco Lavos 8ec12e8030 Fixed the Endoflame recipe. 2016-09-22 23:45:36 +01:00
Vasco Lavos 7b6d87e1f3 Credit where credit is due. 2016-09-22 18:59:19 +01:00
Vasco Lavos bb9a45637c Build 322 2016-09-22 18:55:17 +01:00
Vasco Lavos 587738ab7b Managlass, Alfglass and Bifrost Blocks are now valid targets for Chisels&Bits. Closes #1890 2016-09-22 17:51:48 +01:00
Vasco Lavos a3408e1d2c Finish the dodge ring 2016-09-22 17:38:40 +01:00
Vasco Lavos 23f6260902 Dodge ring 2016-09-22 14:24:34 +01:00
Vasco Lavos d406f987c3 Re-added the seed planting. Quark will disable its own if Botania is present from now on. 2016-09-21 21:29:49 +01:00
Vasco Lavos e0e311a55b Fixed the Lexica Botania's notes accepting localization keys and localizing them. 2016-09-21 18:43:32 +01:00
Vasco Lavos caaaf45de3 The Livingwood Avatar can now place down dirt using the Rod of the Lands. 2016-09-21 18:35:29 +01:00
Vasco Lavos 4bb2cadf72 Made slabs register properly so they don't crash when being placed. 2016-09-21 17:55:25 +01:00
Vasco Lavos 02455bcd1f Potato documentation 2016-09-21 17:54:23 +01:00
Vasco Lavos c7c7a463ab You can now add items to your tiny potato. 2016-09-21 14:18:17 +01:00
Vasco Lavos 35c962b80b Some quotes and stuff 2016-09-21 02:14:10 +01:00
Vasco Lavos 80f49e5e46 Fixed the mana spreader sleeves not being slim fit on top. Also did some wacky transforms to prevent z-fighting. Closes #1884 2016-09-20 23:53:38 +01:00
Vasco Lavos 3809467877 Made the mod's armor a lot bulkier to fix #1878. This is a temporary fix. 2016-09-20 23:24:14 +01:00
Vasco Lavos 1672ec6e26 Removed fanciness 2016-09-20 23:23:43 +01:00
Vasco Lavos cfee9ac0c7 Oh yeah I forgot to uncomment that. 2016-09-20 22:58:18 +01:00
Vasco Lavos 40b23be988 The Rosa Arcana can now get its XP from orbs. 2016-09-20 22:57:59 +01:00
Vasco Lavos 8f9fc75f68 Updated elven portal localization 2016-09-20 12:09:43 +01:00
Vasco Lavos eae32bb704 The Elven Portal now takes mana per transaction rather than per tick. The pylon structure is also not fixed. Todo, document. 2016-09-20 00:00:38 +01:00
Vasco Lavos 15c855fa8a Buffed the gaia guardian's wither effect due to it being easier to dodge now. 2016-09-19 22:43:08 +01:00
Vasco Lavos 842fea1530 The Gaia Guardian's attacks now display as an overlay in the world. 2016-09-19 22:35:26 +01:00
Vasco Lavos e0023fb01d Rebalanced the Gaia Guardian's health and damage cap to make more sense with the damage changes in 1.9. 2016-09-19 21:54:22 +01:00
Vasco Lavos 3ad688f27b Updated documentation for the new changes 2016-09-19 21:53:47 +01:00
Vasco Lavos cf292bb8ab Removed mana loss from spreader to spreader. 2016-09-19 21:16:04 +01:00
Vasco Lavos 70694613b6 Fixed a crash with the vitreous pickaxe. I think. Closes #1889 2016-09-19 21:07:38 +01:00
Vasco Lavos 8873e8351d Attempting to summon a Gaia Guardian with an invalid arena emits particles on the offending blocks. 2016-09-18 23:23:36 +01:00
Vasco Lavos 971ce7e43b Fixed improper resolution for the flugel tiara wings causing framedrops. Closes #1872 2016-09-18 18:25:17 +01:00
Vasco Lavos d2e79ca46f Fixed petal blocks having no color. Closes #1885 2016-09-18 18:09:49 +01:00
Vasco Lavos cd40817917 Merge pull request #1886 from Lanrik/master
Readme logo fix :D
2016-09-18 17:43:20 +01:00
Vasco Lavos bee05ebdbe Merge branch 'master' of https://github.com/Vazkii/Botania 2016-09-18 17:29:38 +01:00
Vasco Lavos 58315019f3 Fixed teru teru bozu not being able to make rain 2016-09-18 17:29:08 +01:00
Lanrik 967df84905 Get ws back 2016-09-18 00:12:25 +04:00
Lanrik 38e508b49b Readme logo fix :D 2016-09-16 17:37:45 +04:00
Vasco Lavos 96c352616e Update contributors.properties 2016-09-14 20:34:47 +01:00
Vasco Lavos 8928fda9a9 Change main page layout and add a button to change the gui scale 2016-09-12 04:03:21 +01:00
Vasco Lavos 4d4bd7efc4 The great meme depression of 2016 2016-09-11 23:37:33 +01:00
Vasco Lavos fd6790af1b Make the dog take away something reasonable 2016-09-11 22:02:59 +01:00
Vasco Lavos 9120a124c7 Re-update lang. 2016-09-11 21:56:10 +01:00
Vasco Lavos 94dfec76de Move the gaia guardian achievement a bit to the side 2016-09-11 19:51:20 +01:00
Vasco Lavos fd801a2ae6 Fixed item stacks not showing up in a lot of places, including the lexicon recipe pages and the mana pool HUD. 2016-09-11 19:34:44 +01:00
Vasco Lavos 6a6dfe094c Move stone transmutation to the main alchemy page. Also removed the prismarine recipe. Closes #1882 2016-09-11 19:28:47 +01:00
Vasco Lavos 362e8d6d5b Remove V2 from the version checker 2016-09-11 19:22:12 +01:00
Vasco Lavos 46befb879d More purging 2016-09-11 19:19:07 +01:00
Vasco Lavos 1edbc41b12 Removed fluff. Closes #1883 2016-09-11 19:12:53 +01:00
Vasco Lavos d98e20319b Fix pylon and petal apothecary models not being placed properly. Closes #1880 and #1879 2016-09-11 18:41:32 +01:00
Vasco Lavos 48826ca660 Update lexicon, achievements and localization for the removal of dayblooms and nightshades. Closes #1881 2016-09-11 18:13:30 +01:00
wiiv 8200f25649 V2? 2016-09-10 18:07:02 +01:00
Vasco Lavos 532e72b90c get a build up n stuff 2016-09-10 00:31:51 +01:00
Vasco Lavos c87762fa30 Honestly not sure on this V2 thing. Let's just stick with r1.9 for now and see how it goes. 2016-09-10 00:21:31 +01:00
Vasco Lavos 73bc2b3663 Pull in williewillus' flower model change 2016-09-10 00:18:26 +01:00
Vasco Lavos 07ccd7c221 Merge branch 'master' of https://github.com/Vazkii/BotaniaV2 2016-09-09 23:47:08 +01:00
Vasco Lavos d423d06f2e Remove remnants of willie's updater thing 2016-09-06 00:52:04 +01:00
Vasco Lavos 88ab3e41fd Remove the hardcoded test version from the checker 2016-09-06 00:51:22 +01:00
Vasco Lavos dd92eaf886 Ladies and Gentlemen! For my first trick... now you see the passive flowers. Now you don't! 2016-09-06 00:48:22 +01:00
Vasco Lavos 309574adc7 Listen scrub, this is my updater. 2016-09-06 00:24:16 +01:00
Vasco Lavos c6f9103b31 Actually update forge. Change stuff around to compile with the default forge mappings. 2016-09-05 23:53:25 +01:00
Vasco Lavos e7753d0a79 Change the forge version to be the same one I'm using in my other mods. Because I'm lazy and can't be bothered to redo my workspace again. I'll probably bump this up later alongside the other mods, but this'll do just for an initial setup. 2016-09-05 23:22:50 +01:00
Vasco Lavos 864eaef196 Oh yeah fix this one too 2016-09-05 22:43:52 +01:00
Vasco Lavos 48750b87b5 Logo update 2016-09-05 22:42:45 +01:00
Vasco Lavos 6a5d5a4f19 MOOOOOOOOOOOVE OOOOOOOOOOUT 2016-09-05 22:31:34 +01:00
Vasco Lavos eb37715da2 Update contributors.properties 2016-08-30 01:03:06 +01:00
Vasco Lavos 86793652a1 Update contributors.properties 2016-08-10 16:56:41 +01:00
Vasco Lavos 980f854518 Update contributors.properties 2016-07-04 21:10:51 +01:00
Vasco Lavos 82cf90ce4c Update contributors.properties 2016-07-04 16:34:36 +01:00
9546 changed files with 180613 additions and 113094 deletions

No files matched your search

+2
View File
@@ -0,0 +1,2 @@
* text=auto eol=lf
*.java text diff=java eol=lf
+30
View File
@@ -0,0 +1,30 @@
Hey there. Looks like you want to contribute with an issue. Great. Here's what you have to do:
* Have a look through the [Botania FAQ](https://botaniamod.net/faq.php), to see if your issue has been solved already;
* Read through the steps on [Bug Reporting 101](https://vazkii.net/br101/) (You may skip this if you're already familiar with reporting issues, but it's good for newcomers);
* Note the following points:
* Issues regarding "Bukkit+Forge" servers that are not reproducible with Forge only are **not accepted**;
* Issues regarding outdated versions of the mod, especially for older versions of Minecraft, are **not accepted**;
* Unless you manually update every mod on the pack to the latest, issues regarding any public modpack that is not officially maintained or supported by the Botania developers (the ones in the modpack section of the website are not) are **not accepted**;
* Duplicate issues or issues that have been solved already (use the search feature!) will be closed without asking.
* Do not tag your issues' names. "Something Broke" is prefered to "[Bug] Something Broke" because there's a proper label system in place.
* Suggestions are **not** accepted here. Post them on the forums or reddit instead. If there's any still open they're old ones before this rule was added.
The following "bugs" are not accepted:
* 1.12 or older version issues
* Only the latest version of the mod is supported.
* Intended Behaviour
* Double tall flowers need be harvested with shears to not clutter the inventory
* Not a Botania problem/Not fixable
* Mana Bursts get destroyed on plugin servers by lag-clearing plugins (add botania:mana_burst to the blacklist)
* Force Relays destroy blocks when used very fast (Can't fix due to the nature of the block)
* Terrasteel crafting won't start (make sure your checkerboard is correct, there's Livingrock under the plate)
[Report the Issue](https://github.com/Vazkii/Botania/issues)!
---
If you want to make a Pull Request keep these in mind:
* Do NOT use the github editor. Test your damn PRs before you submit them.
* We are strict when it comes to syntax. Make sure your PR's syntax matches the syntax of the rest of the code. That includes spacing after if/for/(etc), proper bracket usage, camel casing and copyleft headers on new classes.
* Run the `checkSyntax` Gradle tasks before submitting your PR to identify bad formatting. You can use the `spotlessJavaApply` task to fix some of those issues, like license headers.
* If your pull request edits very small chunks of code and isn't flawless we might close it as it'll probably take less time to fix it ourselves rather than pull yours and change the code.
+29
View File
@@ -0,0 +1,29 @@
---
name: Bug report
about: Report an issue with supported versions of Botania
title: ''
labels: ''
assignees: ''
---
<!--
# Notice
Please do not use github issues to post ideas. Ideas should be posted on the Botania Reddit (https://www.reddit.com/r/botania/), or discussed on Discord.
Please delete everything above the version information, including this notice before submitting your issue.
Tip: Use two spaces at the end of lines to force a new line.
-->
# Version Information
Forge version:
Botania version:
# Further Information
Link to crash log: (please use a paste site such as [gist](https://gist.github.com/), do not attach the .txt or paste the log inline)\
Steps to reproduce:
1. First step
2. Second step
3. etc...
What I expected to happen:
What happened instead:
+22
View File
@@ -0,0 +1,22 @@
name: Java CI
on: [push, pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Cache
uses: actions/cache@v1
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('build.gradle') }}
- name: Build with Gradle
run: ./gradlew pmdMain spotlessJavaCheck build --no-daemon
+20
View File
@@ -0,0 +1,20 @@
name: Mark stale issues and pull requests
on:
schedule:
- cron: "0 0 * * *"
jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'This issue is stale because it has been open for a while with no activity. Please bump if this is still an issue, or this ticket will be closed soon.'
stale-pr-message: 'This PR is stale because it has been open for a while with no activity. Please bump if this is still needed, or this PR will be closed soon.'
exempt-issue-label: 'confirmed'
remove-stale-when-updated: true
+3 -5
View File
@@ -23,6 +23,7 @@ Thumbs.db
/*.ipr
/*.iws
/*.iml
/classes
## Private Stuffs
/private.properties
@@ -30,17 +31,12 @@ Thumbs.db
## Jars
*.jar
!/gradle/wrapper/gradle-wrapper.jar
!GardenOfGlass.jar
### OSX (adds a lot of garbage)###
.DS_Store
.AppleDouble
.LSOverride
# Icon must end with two \r
Icon
# Thumbnails
._*
@@ -59,3 +55,5 @@ Network Trash Folder
Temporary Items
.apdisk
# Data Generator cache
/src/generated/resources/.cache/
Binary file not shown.
BIN
View File
Binary file not shown.
Vendored
+40
View File
@@ -0,0 +1,40 @@
#!/usr/bin/env groovy
pipeline {
agent any
stages {
stage('Clean') {
steps {
echo 'Cleaning Project'
sh 'chmod +x gradlew'
sh './gradlew clean --no-daemon'
}
}
stage('Build and Deploy Release') {
when {
tag 'release-*'
}
environment {
RELEASE_MODE = '1'
}
steps {
sh './gradlew build publish --no-daemon'
}
}
stage('Build and Deploy Snapshot') {
when {
not {
tag 'release-*'
}
}
steps {
sh './gradlew build publish --no-daemon'
}
}
}
post {
always {
archiveArtifacts 'build/libs/**.jar'
}
}
}
+5 -18
View File
@@ -1,21 +1,8 @@
README:
This is williewillus' port and continuation of Botania for Minecraft versions 1.8.x and above
All licensing and distribution rights are exactly as 1.7.10 Botania.
Use at your own risk as bugs may pop up unexpectedly.
As of 2016 02 25, Vazkii has stopped working on Botania. Requests for design changes will still not be accepted here (post them on reddit). Even then, don't expect anything to be added without severe deliberation scrutiny.
Please report all 1.8+ issues to this repository.
These non-CurseForge builds can be openly used in modpacks of any kind, in accordance with the requirements of the license of this mod.
![](https://github.com/Vazkii/Botania/blob/master/web/img/logo.png)
![](web/img/logo.png)
Welcome to the Botania repository.
Botania is a [Minecraft](https://minecraft.net/) mod based on adding natural magic to the game. It's inspired by other magic mods, such as [Thaumcraft](http://www.minecraftforum.net/topic/2011841-) or [Blood Magic](http://www.minecraftforum.net/topic/1899223-).
Botania is a [Minecraft](https://minecraft.net/) mod based on adding natural magic to the game. It's inspired by other magic mods, such as [Thaumcraft](https://www.curseforge.com/minecraft/mc-mods/thaumcraft) or [Blood Magic](https://www.curseforge.com/minecraft/mc-mods/blood-magic).
Botania by Vazkii is licensed under the [Botania License](http://botaniamod.net/license.php)
The current iteration of Botania is made possible thanks to the massive help by the part of [williewillus](https://github.com/williewillus), who ported the mod from 1.8 through to the present day, so go buy him a beer or something, I dunno, he's pretty cool.
Botania is licensed under the [Botania License](http://botaniamod.net/license.php)
Binary file not shown.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 332 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 374 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 387 B

Loaded 100 of 9546 files, more files were not shown because too many files have changed in this diff. Show more