c483591ea8
Merge branch '1.12.2' of https://github.com/Electroblob77/Wizardry into 1.12.2
...
# Conflicts:
# src/main/resources/assets/ebwizardry/lang/ru_ru.lang
2020-12-19 23:41:22 +00:00
f4cf98089c
New contributors
2020-12-19 23:24:38 +00:00
1d247e2d56
Re-implment layer fix from Pull Request 312
2020-12-17 11:39:50 -06:00
fb010d3726
Update version number
2020-11-03 01:36:16 +00:00
c64731e7a9
Fix ClassCastException in player animations, fixes #533
...
Somehow some unwrapped model parts managed to slip through (exactly *how* is a mystery!) so we're just safety-checking everything, I doubt this incurs much performance cost in the scheme of things.
2020-11-03 01:33:22 +00:00
80cf77ecc6
Fix GL stack overflow / weird rendering when arrows are stuck in the player, fixes #529 and #530
2020-11-03 01:08:14 +00:00
3d3806c20b
Prevent receptacles dropping on neighbour change when attached to an imbuement altar, fixes #520
2020-11-03 01:08:11 +00:00
315f2e4b02
Reinstate missing null check in SpellRay, fixes part of #519
2020-10-28 23:43:08 +00:00
d3df59df73
Have PlayerAnimator ignore renderers for which no layers/models are stored, fixes #518
...
This will stop the crashing but might well mean broken animations - for now there's not much I can do about that
2020-10-28 23:37:51 +00:00
cfd3e796e1
Make PlayerAnimator disable itself when MoBends is installed
2020-10-28 23:27:04 +00:00
d97e843f7b
Guard against all possible nulls to be on the safe side, fixes #517
2020-10-28 23:20:48 +00:00
3b4ce68606
Third time lucky
2020-10-23 15:55:03 +01:00
164e9dbe36
And that one
2020-10-23 15:48:59 +01:00
2a21eb4392
Fix NPE in donor perk packet
2020-10-23 15:38:29 +01:00
97061f7a32
Merge branch '4.3-dev' into 1.12.2
2020-10-23 15:14:53 +01:00
7f84f3daef
Temporary fix for lag in imbuement updating, ultimately this needs a rewrite but *effort*...
2020-10-23 15:09:19 +01:00
9f3e09498d
Hopefully fixes #469
2020-10-23 15:06:41 +01:00
55bcd92860
Replace dummy criteria with proper generic imbuement altar criterion
2020-10-23 14:48:02 +01:00
1030a2a4f3
Disable this for now, it's not a big deal
2020-10-23 14:34:21 +01:00
bc407187e1
This works now
2020-10-23 14:13:35 +01:00
62c7b6b7bb
Fix imbuement altar not dropping its contents
2020-10-23 14:13:26 +01:00
35ac115e8b
Change imbuement altar face shapes back to how they should be and give receptacles a special case for attachment
2020-10-23 14:13:09 +01:00
21dabc9cfc
Probably should be this one
2020-10-23 13:07:02 +01:00
77d9bfc772
Blast modifier support for permafrost, plus various fixes and an attempt at slipperiness
2020-10-23 13:06:54 +01:00
29617451d8
Add permafrost spell and fix dry frosted ice not being very icy
2020-10-23 01:22:28 +01:00
e530695f54
Give conjured items a blue timer (durability) bar
2020-10-22 23:50:49 +01:00
1f4de65356
Cleanup
2020-10-21 22:46:30 +01:00
9dc186abf4
Fix the charge meter showing when holding a wand in the offhand but using the main hand item
2020-10-21 22:41:26 +01:00
086d9f6af6
A few tweaks and fixes for flamecatcher
2020-10-21 22:37:53 +01:00
7e658d74b5
Probably shouldn't be rendering the ends of this
2020-10-21 22:24:07 +01:00
2bb242e6fb
Add flamecatcher spell, and addItemExtras hook for SpellConjuration
2020-10-21 22:23:54 +01:00
d85441867e
Remove knockback from celestial smite
2020-10-21 21:20:18 +01:00
38aa80d60a
That didn't work :(
2020-10-20 00:22:17 +01:00
f41effd44f
Add config option to change progression requirements
2020-10-19 23:52:27 +01:00
17fad8b33c
Reduce progression requirement for novice tier
2020-10-19 23:37:36 +01:00
1c96c88082
Remove shadow from players under the effects of mirage
2020-10-19 23:37:12 +01:00
89345d4fbc
Add mirage spell
2020-10-18 22:12:14 +01:00
cf8de05d1b
Make celestial smite ignore mobs when raytracing
2020-10-18 20:37:43 +01:00
f9432c7c05
Add celestial smite spell
2020-10-18 01:17:31 +01:00
d6f30d6519
Change guardian beam to use a single sound event and time it with the damage
2020-10-18 00:56:30 +01:00
bf13491987
A healthy splash of optimise imports
2020-10-18 00:12:29 +01:00
0dd26de905
Add guardian beam spell
2020-10-17 15:28:51 +01:00
795bdcd427
Fix player animations being applied to all instances of the model
2020-10-17 13:02:09 +01:00
6f57d2366e
Fix healing totem beam origin for healing allies
2020-10-16 19:43:13 +01:00
8b86bb1b31
Add Lokenzen's ring
2020-10-16 19:42:56 +01:00
0db343c959
Add enrage spell
2020-10-10 19:15:15 +01:00
f5cd740497
Add amulet of esundor, plus fixes for frost barrier
2020-10-10 18:30:54 +01:00
b6c67ddf34
Add ring of volthraa
2020-10-06 00:34:19 +01:00
970894ea21
Comments and TODOs
2020-10-03 00:54:29 +01:00
d5d933b4e6
Add dire wolf pelt
2020-10-03 00:54:20 +01:00
Electroblob77