Commit Graph
6233 Commits
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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