438f5d7a2e
Merge branch '1.12.2' into 1.12.2-dev
2018-06-05 21:44:17 +01:00
dec5b1ac2c
Add witty/stupid comments to a few classes
2018-06-05 21:26:07 +01:00
726a306830
Delete redundant classes
2018-06-05 21:25:41 +01:00
330c78a92c
Change non-evil wizard health from 20 to 30
2018-06-05 21:24:47 +01:00
dcec7c7281
Miscellaneous cleanup and commenting
2018-06-05 21:24:09 +01:00
b9ba25c116
Add test cases for new particle effects; to be applied to everything once spells have been reorganised
2018-06-05 21:18:01 +01:00
0341a603d5
Missed the imports on that one...
2018-06-05 21:15:02 +01:00
d91a3e056a
The great particle refactoring part 1: Introducing ParticleBuilder!
...
Adds ParticleBuilder to replace the particle spawning methods in the proxies, and changes all particle spawning to use the builder except for in the spell classes, which are to be reorganised first.
2018-06-05 21:13:41 +01:00
9c1042f686
Update version number
2018-06-05 17:01:04 +01:00
cad3fee1b9
Update mcmod.info
2018-06-05 16:58:33 +01:00
5947b2ee62
Fix smoke bomb recipe and allow charcoal to be used
2018-06-05 16:00:47 +01:00
177a39bad1
Cleanup
2018-06-05 15:43:56 +01:00
cdf8f6e32d
Remove now-redundant recipe config options
2018-06-05 15:43:48 +01:00
f88aac11e9
Convert all non-dynamic recipes to JSON, add ore dictionary support where appropriate and change incorrect "amount" tag to "count", fixes #18
2018-06-05 15:43:14 +01:00
05b905b988
Fix light level detection for petrified creatures breaking out
2018-06-05 14:12:33 +01:00
669cd2892d
Add check for valid special wand upgrades, fixes #48
2018-06-05 11:12:03 +01:00
dd07d08ff0
Return true in ADS methods when passed a null attacker, acting as a fallback for when caster does not save properly; fixes #40
2018-06-04 23:45:10 +01:00
54bb327fdf
Properly sync thrower field for all throwable projectiles, fixes #42 (does not fix vanilla throwables though)
2018-06-04 23:42:12 +01:00
2cd8b46c1f
Add toughness to legendary wizard armour
2018-06-04 18:32:32 +01:00
b61413f7f1
Remove ISpecialArmor from ItemWizardArmour since it is no longer necessary, fixes #44
2018-06-04 18:20:55 +01:00
4e7765a7e7
Allow tab-completion of spell names in commands without specifying the modid
2018-06-04 18:04:36 +01:00
49a6dc43c1
Cleanup
2018-06-04 17:20:39 +01:00
b82bc6698f
Make crystal ore drop xp when mined
2018-06-04 17:17:58 +01:00
1e43c67660
Tweak summoned creature targeting so that non-evil wizards' minions no longer attack players unless the player in question has angered the wizard
2018-06-04 17:17:33 +01:00
c129571167
Change EntityWizard to implement IMerchant and INpc directly rather than extending EntityVillager, fixes #38 plus a number of other bugs
2018-06-04 16:36:20 +01:00
b23a643c0e
Make arcane workbench drop items correctly when broken, fixes #20
2018-06-04 15:00:02 +01:00
194bff3e6a
Miscellaneous lang file fixes
2018-06-04 13:09:23 +01:00
426ca78288
Sort config options into a more logical order
2018-06-04 12:51:12 +01:00
f15919fdce
Organise the config file and GUI into categories
2018-06-04 12:39:56 +01:00
2124842136
Fix transportation stone not dropping when unsupported, fixes #23
2018-06-03 23:57:22 +01:00
70e697876b
Centralise code for config GUI category classes
2018-06-03 23:24:42 +01:00
9b5e5a871c
Add dimension whitelist option for evil wizard spawning and restrict numbers to 1 per chunk, closes #26
2018-06-03 22:22:18 +01:00
5ba92e5de5
Change whitelist/blacklist storage from strings to resourcelocations to bring it in line with the registry system
2018-06-03 22:17:57 +01:00
4e6780a3cf
Replace getEntityString with getKey(...).toString()
2018-06-03 18:19:10 +01:00
00584ad635
Move resistances config setup from preInit to init
2018-06-03 18:18:29 +01:00
f72ed33515
Add mind control targets blacklist config option
2018-06-03 18:17:05 +01:00
c2366ed1ba
Change crystal ore drop quantity to drop the intended 1-3 crystals (rather than the previous 1-2) and change fortune behaviour to work like vanilla ores, see discussion in #43
2018-06-03 15:52:13 +01:00
46df8d7311
Add smelting recipe for crystal ore, closes #43
2018-06-03 15:15:50 +01:00
d4579b9184
Remove all calls to GlStateManager.pushAttrib() and pullAttrib() and a few other tweaks to gl calls, fixes #12 , #46 and #47
2018-06-03 12:39:25 +01:00
ee6f0cfe70
Correct death message lang key in code, fixes #41
2018-06-02 16:08:48 +01:00
6155fd9c68
Display non-keyboard keybinds correctly, fixes #36
2018-06-02 15:14:32 +01:00
32c0608b51
Stop spirit horses dropping leather, fixes #37 . Also adds the same overrides to spirit wolves; since regular wolves don't drop anything this wasn't noticeable.
2018-06-02 13:39:21 +01:00
404df6af23
Fixes #32
2018-06-02 13:35:37 +01:00
764e10538b
Update LICENSE.md
2018-05-21 10:45:11 +01:00
6b1b590e30
Merge pull request #25 from Shadows-of-Fire/client
...
Fixes #17 , #22 , and maybe #12
2018-05-04 19:50:11 +01:00
8360e520cd
De-duplicate armor value
2018-05-04 14:34:09 -04:00
005a17d750
Fix armor value tooltips
2018-05-04 14:23:57 -04:00
28abe036a0
Armor properly has 0 damage reduction when oom
...
tooltip is being buggy, won't display armor reduction values.
2018-05-04 08:18:15 -04:00
ca96112b67
Fix wizard armor breaking
2018-05-04 07:35:51 -04:00
b8e847c6a6
Fixes #22
2018-05-04 06:53:11 -04:00
Electroblob