Commit graph

601 commits

Author SHA1 Message Date
Ell
9e0a2a65d1 fixed the one remaining issue? 2020-09-22 03:20:56 +02:00
Ell
7c8c51cf4b Merge remote-tracking branch 'origin/master'
# Conflicts:
#	build.gradle
#	src/main/java/de/ellpeck/naturesaura/compat/jei/AnimalSpawnerCategory.java
#	src/main/java/de/ellpeck/naturesaura/recipes/AnimalSpawnerRecipe.java
2020-09-22 03:17:24 +02:00
Ell
cb1b37c96e IT COMPILES
I'll test it tomorrow :^)
2020-09-22 03:17:02 +02:00
Ell
7bdec46112 Fixed the snow creator using the wrong config flag
Closes #137
2020-09-02 21:55:01 +02:00
Ell
8f9e4df351 fixed the winter's calling creating snow in invalid locations
Closes #138
2020-09-02 21:36:08 +02:00
Ell
1ccdc83c1f Fixed some mobs causing client crashes when spawning with the altar of birthing
Closes #140
2020-09-02 21:25:02 +02:00
Ellpeck
418920ffdf Only update entity age every 2 seconds
Closes #135
2020-08-13 14:14:45 +02:00
Ellpeck
5a4dbfb453 Fixed spawn lamp behavior sometimes persisting without the lamps being present
Closes #131
2020-07-23 16:33:06 +02:00
Ellpeck
d1e445e54d Fixed the herbivorous absorber range being wrong in the magnifier
Closes #129
2020-07-23 16:29:52 +02:00
Ellpeck
8755a1a660 Fixed skyseeker's pickaxe dupliction glich
Closes #128
2020-07-12 18:56:46 +02:00
Ellpeck
67af09918f Fixed the ore gen config not working with tags
Closes #127
2020-07-12 18:55:44 +02:00
Ellpeck
f78e5420c4 Fixed a serverside crash with the skyseekers pickaxe
Closes #123
2020-05-28 15:10:26 +02:00
Ellpeck
3b37ba0c30 fixed a bunch of server crashing issues
Closes #122
2020-05-22 12:26:35 +02:00
Ellpeck
438a1b0c24 eir's token 2020-05-20 15:41:55 +02:00
Ellpeck
b4990a6664 eyes of the shulker and blaze 2020-05-20 14:55:59 +02:00
Ellpeck
e69bc977c6 made the aura bloom and end rose work with the flower generator, in case anyone wants that 2020-05-17 21:47:48 +02:00
Ellpeck
e43100a5af made the staff of riches find spawners too 2020-05-17 21:33:47 +02:00
Ellpeck
32ceab5387 made the snow creator have a circular area 2020-05-17 21:26:37 +02:00
Ellpeck
7171e12dc5 increase projectile generator rates
Closes #118
2020-05-17 21:08:06 +02:00
Ellpeck
b4cc78e19f finished sky tools 2020-05-13 17:57:31 +02:00
Ellpeck
6473bb81d0 sky tools, part 1 2020-05-13 15:52:46 +02:00
Ellpeck
cd740b8485 fixed the aura type config not working for some mods
Closes #116
2020-05-13 14:07:33 +02:00
Ellpeck
8e66deeb9d made the sky ingot from gold actually have more yield 2020-05-12 22:36:14 +02:00
Ellpeck
82d72d8b57 fixed ancient leaves not decaying
Closes #117
2020-05-12 17:35:32 +02:00
Ellpeck
7f4d6da0a6 run config later and validate some stuff in an attempt to address #116 2020-05-12 14:24:50 +02:00
Ellpeck
c87bcca0d9 made items on wood stands look a lot better 2020-05-12 02:15:18 +02:00
Ellpeck
e721b19580 Fixed the botanist's shovel not creating grass paths
Closes #114
2020-05-12 01:57:28 +02:00
Ellpeck
135a2bf9ce finished the timer 2020-05-05 20:04:45 +02:00
Ellpeck
1328278663 aura timer, part 1 2020-05-05 19:43:27 +02:00
Ellpeck
000c234759 update bottles to new textures 2020-05-05 16:44:30 +02:00
Ellpeck
3a65e1dd1e finished the chorus generator 2020-05-05 00:05:38 +02:00
Ellpeck
6c46a37793 fixed new mobs missing from the patchouli manual 2020-05-04 23:46:33 +02:00
Ellpeck
1c3e3dfd2a chorus generator, part 1 2020-05-04 23:39:57 +02:00
Ellpeck
fd2c663653 half-ish moss generator rate 2020-05-02 03:04:13 +02:00
Ellpeck
e1f17c06ed stopped the ancient tree from dropping saplings 2020-05-02 03:03:17 +02:00
Ellpeck
ee2f696809 more transmutation catalyst recipes 2020-05-02 02:51:23 +02:00
Ellpeck
0175c836e2 made the blast furnace booster only work on ores 2020-05-02 02:24:16 +02:00
Ellpeck
7f34287d2a Fixed some recipes straight up not being registered
Closes #110
2020-05-01 22:44:05 +02:00
Ellpeck
253fb64cac made all recipes JSON 2020-04-29 16:38:50 +02:00
Ellpeck
288d09feda re-add foreign ores to the ores list 2020-04-29 00:24:07 +02:00
Ellpeck
32c62cbc50 fixed recipes not being loaded properly when reloading 2020-04-29 00:11:43 +02:00
Ellpeck
79e1997d1d fixed recipes and the book being broken in multiplayer, haha 2020-04-28 23:03:14 +02:00
Ellpeck
fd903aae78 fix mods.toml probably? 2020-04-28 21:20:37 +02:00
Ellpeck
2d370c44b8 Added a config option to disable player rendering
Closes #106
2020-04-27 22:24:02 +02:00
Ellpeck
2915ce494d finished the staff 2020-04-27 19:22:06 +02:00
Ellpeck
bf4a76431e light staff, part 1 2020-04-27 18:30:44 +02:00
Ellpeck
d854be3e34 fixed the staff of shadows crashing on magma blocks 2020-04-27 17:01:26 +02:00
Ellpeck
15f067a1c9 crafttweaker! 2020-04-26 20:40:28 +02:00
Ellpeck
ac9b248e84 Merge remote-tracking branch 'origin/master' 2020-04-26 19:37:29 +02:00
Ellpeck
a21f32a4b3 possibly finally fixed that recipe tag issue 2020-04-26 19:37:15 +02:00
xRoBoTx
0bd47298cd
Small fixes in ru_ru (#107)
Added missing commas and missing translation.
2020-04-26 17:22:12 +02:00
Debucquoy Anthony tonitch
f7fdc00f4b
French (#103)
* French Base

* Translate every items
2020-04-04 23:22:52 +02:00
Ellpeck
2cd29628c4 Fixed the furnace heater hitbox being wrong
Closes #100
2020-04-03 23:25:41 +02:00
Ellpeck
25bd69eab4 possibly fix another mod ordering issue? 2020-04-03 23:11:59 +02:00
Ellpeck
0f23eb834b made all of the compat modules run later because honestly 2020-04-01 01:46:33 +02:00
Ellpeck
bbe138ac78 fix + update 2020-04-01 00:43:27 +02:00
Ellpeck
d47520f8cf remove api stubs 2020-03-29 21:10:31 +02:00
croteco
b40bed2447
add Chinese translation to the guide book (#97)
* Add files via upload

* Update zh_cn.json
2020-03-27 20:27:26 +01:00
croteco
67b974b3de
completion & correction 补全修正 (#95)
主要改变:
荒古 -> 远古 (理由:无"荒"之意)
2020-03-19 14:06:09 +01:00
Ellpeck
66aaaaf62c possibly fix a depth issue with particles 2020-03-14 23:00:31 +01:00
Ellpeck
26616ce0c2 reduce the cached amount actually 2020-03-14 13:58:45 +01:00
Ellpeck
6f13d970dd Merge remote-tracking branch 'origin/master' 2020-03-14 13:54:46 +01:00
Ellpeck
713ca2782f refine this homi fix thing 2020-03-14 13:54:31 +01:00
EnterFor
b422495645
Create zh_cn.json (#91)
[1.15.2] Chinese localization
2020-03-14 13:03:22 +01:00
Ellpeck
444aae4bea Fixed a huge issue
Closes #90
2020-03-14 03:10:56 +01:00
Ellpeck
1a825edda3 Fixed bamboo being stupid, also updated Forge
Closes #89
2020-03-14 00:47:54 +01:00
Ellpeck
c0cc6166c1 added a config to move the aura cache bar
Closes #88
2020-03-11 23:32:37 +01:00
Ellpeck
31de298ef9 I did it mom 2020-03-11 23:14:42 +01:00
Ellpeck
c0806e3419 disallow disabling all negative aura imbalance effects
Can't believe this is something I have to do
2020-03-08 16:23:31 +01:00
Ellpeck
e4e3d2a72c Fixed the animal effect crashing dedicated servers
Closes #86
2020-03-04 14:32:12 +01:00
Ellpeck
34c205accf possibly fixed chunk watch event stalling the chunk gen thread #84 2020-03-01 19:25:39 +01:00
Ellpeck
643d9111af finished the staff of riches 2020-02-28 15:52:33 +01:00
Ellpeck
391f5b13f5 loot finder, part 1 2020-02-28 15:36:12 +01:00
Ellpeck
4bd1f9eece gay 2020-02-27 12:27:34 +01:00
Ellpeck
cb928c5bbf finally added back the aura command 2020-02-26 20:01:57 +01:00
Ellpeck
74d4e9cab5 patchouli for the nether grass effect 2020-02-26 19:38:47 +01:00
Ellpeck
3c6f350f4c added grassy netherrack generation 2020-02-26 19:32:42 +01:00
Ellpeck
cf1302e5dd clarify *even more* 2020-02-26 12:13:51 +01:00
Ellpeck
4572564faa clarify some stuff about the altars 2020-02-26 12:10:06 +01:00
Ellpeck
3bf19aff8b integrate tainted gold and the crimson altar with everything 2020-02-26 12:03:36 +01:00
Ellpeck
c5770e9e75 made the environmental eye bar color match the aura color 2020-02-26 11:07:53 +01:00
Ellpeck
be96feb704 nether version of the catalysts 2020-02-26 10:55:19 +01:00
Ellpeck
0ef69b0560 use isSimilar over isPresentInWorld 2020-02-25 23:14:19 +01:00
Ellpeck
b5777f715b made the nether altar work 2020-02-25 22:57:10 +01:00
Ellpeck
5be58608b6 nether altar, part 1 2020-02-25 20:07:26 +01:00
Ellpeck
f459116238 aura plant patchouli 2020-02-25 16:10:25 +01:00
Ellpeck
29b291eb15 added the aura cactus 2020-02-25 15:56:46 +01:00
Ellpeck
a4f0f509e8 added aura bloom 2020-02-25 15:14:56 +01:00
Ellpeck
2505975c32 finished the item distributor 2020-02-22 10:56:29 +01:00
Ellpeck
94a2092408 item distributor, part 1 2020-02-21 18:15:37 +01:00
Ellpeck
1b565e7800 fixed the snow creator being made of wood 2020-02-21 17:16:16 +01:00
Ellpeck
df1b703534 fixed the spawn lamp crashing
Closes #80
2020-02-16 15:18:15 +01:00
Ellpeck
02de4bce7f Also apply the spawn lamp fix in 1.15
Closes #77
2020-02-15 13:07:43 +01:00
Ellpeck
90e93bdb35 fixed the gold fiber recipe using the wrong tall grass
Closes #76
2020-02-10 17:11:19 +01:00
Ellpeck
d978b4f9b1 rookie mistake 2020-02-08 13:20:35 +01:00
Ellpeck
75cb0c98a8 fixed the plant boost effect affecting grass blocks 2020-02-08 13:19:38 +01:00
Ellpeck
66874dc33e fixed the plant boost effect not working 2020-02-08 01:21:29 +01:00
Ellpeck
5a44d3f8af ring of last chance 2020-02-07 23:50:16 +01:00
Ellpeck
d1de398db4 added back enchantability compat 2020-02-07 21:25:22 +01:00
Ellpeck
6a20dbadc9 cleanup 2020-02-07 15:22:30 +01:00
Ellpeck
f76167fc59 remove enchantability for now while I figure out the rest of azure 2020-02-07 12:27:13 +01:00
Ellpeck
3319a9673a added waterlogging to non-full blocks
Closes #75
2020-02-05 14:30:17 +01:00
Ellpeck
f5ae1d59b4 made the snow creator not infinitely use aura lol 2020-02-04 00:35:38 +01:00
Ellpeck
5b0b797a2f added new entities to the animal spawner 2020-02-02 23:40:44 +01:00
Ellpeck
7facce56c2 finished the Winter's Calling 2020-02-02 23:27:40 +01:00
Ellpeck
d2d2161d04 snow creator, part 2 2020-02-02 22:50:02 +01:00
Ellpeck
93d65914b7 snow creator, part 1 2020-02-02 22:21:55 +01:00
Ellpeck
2a88c1e7ac finished the corporeal eye 2020-02-02 19:43:40 +01:00
Ellpeck
75fb931c5f animal container, part 1 2020-02-02 18:00:52 +01:00
Ellpeck
e240aade3a fixed the advancement screen 2020-02-01 17:25:16 +01:00
Ellpeck
492ea2eec9 added nature's heal 2020-02-01 17:22:34 +01:00
Ellpeck
c63bc43d12 add patchouli for crimson meal 2020-01-31 22:21:16 +01:00
Ellpeck
8ff1bed7f5 updated patchouli and two very minor fixes 2020-01-31 22:02:04 +01:00
Ellpeck
74b068de2a made the projectile generator not z-fight 2020-01-31 13:42:21 +01:00
Ellpeck
40757e258a finished the crimson meal 2020-01-30 20:35:25 +01:00
Ellpeck
22c38d363e added nether wart trees 2020-01-30 16:04:40 +01:00
Ellpeck
d5cb1ab0df Merge branch '1.14' 2020-01-30 13:48:20 +01:00
Ellpeck
26a41c5055 Fixed end flowers crashing when being spawned
Closes #73
2020-01-30 13:45:19 +01:00
Ellpeck
e5db5d9fe6 made dimension rails work again, yay 2020-01-29 21:36:21 +01:00
Ellpeck
615fbe3f88 made the projectile generator not waste additional aura 2020-01-29 21:19:00 +01:00
Ellpeck
f7138175fb made the ender crate renderer a bit nicer 2020-01-29 20:32:24 +01:00
Ellpeck
e1d6a52112 fixed the color changer 2020-01-29 20:22:10 +01:00
Ellpeck
c2c88dec61 fixed the ancient tree gen not deleting the sapling 2020-01-29 19:11:54 +01:00
Ellpeck
e8e3457b34 fixed all the rendering yeees 2020-01-29 19:04:33 +01:00
Ellpeck
161e38187e rendering stuff is almost finally fixed yaaaaaaaay 2020-01-29 18:18:41 +01:00
Ellpeck
0ac27ff2bb fixed custom renderers (particles, boxes) 2020-01-29 14:32:32 +01:00
Ellpeck
76e8fa9008 models DONE MY GOD 2020-01-29 01:34:58 +01:00
Ellpeck
31b0ced5e4 models, part 1 2020-01-29 00:40:28 +01:00
Ellpeck
3d3e2d93ae it launches, but it's completely fucked 2020-01-28 20:36:08 +01:00
Ellpeck
8737bc28f6 part 1 2020-01-28 18:08:56 +01:00
Ellpeck
ca93c2f232 made the shooting mark also require the creational catalyst to produce beyond the limit 2020-01-27 00:11:16 +01:00
Ellpeck
bea159dcd5 added curios compatibility 2020-01-26 19:26:50 +01:00
Ellpeck
13e793d703 finished the Armorer's Aid 2020-01-26 17:59:58 +01:00
Ellpeck
73a925794f blast furnace booster, part 2 2020-01-26 15:52:16 +01:00
Ellpeck
ef257e7f80 blast furnace booster, part 1 2020-01-26 02:20:08 +01:00
Ellpeck
7330809178 rename items to fit the style 2020-01-26 01:41:49 +01:00
Ellpeck
5e8e434925 made the swamp homi not accept converted moss stone 2020-01-26 00:43:12 +01:00
Ellpeck
040f48b612 made the particle packet nicer 2020-01-26 00:16:06 +01:00
Ellpeck
386dec00d1 added aura mending 2020-01-25 19:18:45 +01:00
Ellpeck
c59d7e610e Misc fixes, including closing #70 2020-01-25 16:56:04 +01:00
Ellpeck
ad59eac0cf removed the weird poof from the shockwave creator - how did it get here? 2020-01-24 23:53:38 +01:00
Ellpeck
61f966c071 disabled the dimension rail, updated forge 2020-01-24 22:45:11 +01:00
Ellpeck
932d4ed039 fixed the server and brought back the chunk loader! 2020-01-24 20:49:09 +01:00
Ellpeck
3ff0aed4ad heaps of misc changes 2020-01-24 17:05:41 +01:00
Ellpeck
3077a0869a more misc porting work yay 2020-01-23 22:40:03 +01:00
Ellpeck
8ebe165a28 more fixes, woop de doop 2020-01-23 20:57:56 +01:00
Ellpeck
a208887b25 more misc fixes, yay 2020-01-23 19:20:47 +01:00
Ellpeck
136c125f2c misc changes, including item drops 2020-01-23 16:05:52 +01:00
Ellpeck
25d3550e0a hopefully finally caused the game to not hang????????????? 2020-01-23 02:20:02 +01:00
Ellpeck
81c6034c21 misc fixes including making aura effects work! 2020-01-23 02:01:05 +01:00