Commit Graph

1047 Commits

Author SHA1 Message Date
Electroblob77 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
Electroblob77 4c3dfb3bc9 Update Russian translations, courtesy of DrHesperus 2020-12-19 23:34:02 +00:00
Electroblob77 0010fafc13 Update German translations, courtesy of Lemopav 2020-12-19 23:25:38 +00:00
Electroblob77 f4cf98089c New contributors 2020-12-19 23:24:38 +00:00
Electroblob77 8e3a33b084 Update Korean translations, courtesy of red1854th 2020-12-19 23:24:26 +00:00
Electroblob b1478de6fe Merge pull request #577 from Aralu115/Fix-Layer-Issue-LycaniteMobs
Re-implement layer fix from Pull Request 312
2020-12-18 16:23:01 +00:00
Aralu 1d247e2d56 Re-implment layer fix from Pull Request 312 2020-12-17 11:39:50 -06:00
Electroblob e8292f1e96 Merge pull request #574 from LWHK/TC
Fix uncorrect file path and add untranslated content to zh_tw.json
2020-12-13 12:00:22 +00:00
TUsama bc0b712e2b add untranslated content
2
2020-12-13 16:33:46 +08:00
TUsama 47135f00d7 fix the file path error 2020-12-13 16:21:53 +08:00
Electroblob c615ad365c Merge pull request #568 from LWHK/TC
Rollback the zh_tw.json to the last UTF-8 code version due to the bug fix
2020-12-11 11:56:30 +00:00
Electroblob 39c3989796 Merge pull request #571 from WinDanesz/patch-1
Update ru_ru.lang fixing mana info on the arcane workbench
2020-12-11 11:55:32 +00:00
WinDanesz e808ab2b1f Update ru_ru.lang fixing mana info on the arcane workbench 2020-12-11 00:37:17 +01:00
TUsama a25f942722 Rollback the zh_tw to the last UTF-8 code version because of the bug fix 2020-12-09 10:16:43 +08:00
Electroblob 14e481a71d Merge pull request #543 from Determancer/patch-3
New Chinese Simplified Translation for Imbuement
2020-11-05 11:39:07 +00:00
Determancer ac226f1444 an untranslated one, oops 2020-11-05 10:49:31 +08:00
Determancer 741d918d9b another tweak 2020-11-05 10:46:53 +08:00
Determancer f504505bf5 New Translation for Imbuement
Changing the current translation based on the latest discussion.
2020-11-05 10:44:49 +08:00
Electroblob77 fb010d3726 Update version number 4.3.1 2020-11-03 01:36:16 +00:00
Electroblob77 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
Electroblob77 d3837a6185 Update credits 2020-11-03 01:20:16 +00:00
Electroblob77 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
Electroblob77 3d3806c20b Prevent receptacles dropping on neighbour change when attached to an imbuement altar, fixes #520 2020-11-03 01:08:11 +00:00
Electroblob77 d952e9b255 Update Polish translations, courtesy of Olej 2020-11-01 15:06:49 +00:00
Electroblob77 33c8f08adf Update spanish handbook translations, courtesy of Alsentar 2020-11-01 10:41:45 +00:00
Electroblob77 315f2e4b02 Reinstate missing null check in SpellRay, fixes part of #519 2020-10-28 23:43:08 +00:00
Electroblob77 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
Electroblob77 cfd3e796e1 Make PlayerAnimator disable itself when MoBends is installed 2020-10-28 23:27:04 +00:00
Electroblob77 d97e843f7b Guard against all possible nulls to be on the safe side, fixes #517 2020-10-28 23:20:48 +00:00
Electroblob77 15a153fe11 Merge branch '1.12.2' of https://github.com/Electroblob77/Wizardry into 1.12.2 2020-10-28 23:20:13 +00:00
Electroblob77 d00b7279ee Update Hungarian translations, courtesy of Bombadil 2020-10-28 23:20:06 +00:00
Electroblob77 0142cc05bc Update Korean translations, courtesy of 방통 2020-10-28 23:19:47 +00:00
Electroblob 23621b8045 Merge pull request #526 from LWHK/1.12.2
Update CHS  translation version to 4.3
2020-10-26 23:26:18 +00:00
TUsama 7f2978bc7a Enhance some details
Co-Authored-By: Determancer <49300241+Determancer@users.noreply.github.com>
Co-Authored-By: WuzgXY <62000315+WuzgXY-GitHub@users.noreply.github.com>
2020-10-26 23:08:26 +08:00
TUsama 312364ba77 Update CHS translation version to 4.3
Co-Authored-By: Determancer <49300241+Determancer@users.noreply.github.com>
Co-Authored-By: Hokorizero <50108932+Hokorizero@users.noreply.github.com>
2020-10-26 09:50:21 +08:00
Electroblob77 3b4ce68606 Third time lucky 4.3.0 2020-10-23 15:55:03 +01:00
Electroblob77 164e9dbe36 And that one 2020-10-23 15:48:59 +01:00
Electroblob77 2a21eb4392 Fix NPE in donor perk packet 2020-10-23 15:38:29 +01:00
Electroblob77 97061f7a32 Merge branch '4.3-dev' into 1.12.2 2020-10-23 15:14:53 +01:00
Electroblob77 7f84f3daef Temporary fix for lag in imbuement updating, ultimately this needs a rewrite but *effort*... 2020-10-23 15:09:19 +01:00
Electroblob77 9f3e09498d Hopefully fixes #469 2020-10-23 15:06:41 +01:00
Electroblob77 55bcd92860 Replace dummy criteria with proper generic imbuement altar criterion 2020-10-23 14:48:02 +01:00
Electroblob77 1030a2a4f3 Disable this for now, it's not a big deal 2020-10-23 14:34:21 +01:00
Electroblob77 bc407187e1 This works now 2020-10-23 14:13:35 +01:00
Electroblob77 62c7b6b7bb Fix imbuement altar not dropping its contents 2020-10-23 14:13:26 +01:00
Electroblob77 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
Electroblob77 f99f8c271e Add the rest of the new spells to the advancements 2020-10-23 13:23:32 +01:00
Electroblob77 21dabc9cfc Probably should be this one 2020-10-23 13:07:02 +01:00
Electroblob77 77d9bfc772 Blast modifier support for permafrost, plus various fixes and an attempt at slipperiness 2020-10-23 13:06:54 +01:00
Electroblob77 29617451d8 Add permafrost spell and fix dry frosted ice not being very icy 2020-10-23 01:22:28 +01:00