Commit Graph

1006 Commits

Author SHA1 Message Date
Rafael Soares 7c2e786d0b Remove whitespace changes 2020-03-27 20:53:25 -03:00
Rafael Soares a7ee0ad847 Make Magic Silk recipe use ore_dict for string
Currently, the recipe requires string to be a Vanilla string, which might cause problems in packs with different methods for obtaining strings (eg: Mystical World's Silk Thread from silkworms).

This PR makes it compatible with Ore Dictionary, so the recipe accepts any type of string.
2020-03-27 20:49:51 -03:00
Clefal 033d90ed3e Update zh_cn.lang 2020-03-26 16:39:59 +08:00
Electroblob77 849066de8a Apparently we do need this after all 2020-03-25 15:20:24 +00:00
Electroblob77 eb65b7d7b7 Reorganise config again 2020-03-25 15:14:58 +00:00
Electroblob77 97499eb523 Update version number 2020-03-25 15:08:15 +00:00
Electroblob77 02480db158 Reorganise config file 2020-03-25 15:05:32 +00:00
Electroblob77 e35ee9d126 Merge branch '1.12.2' into 4.3-dev 2020-03-25 14:29:53 +00:00
Electroblob77 004c4c09e3 Add bookshelves 2020-03-25 14:29:27 +00:00
Clefal 52214f81cf Update zh_cn.lang 2020-03-25 11:49:38 +08:00
Clefal 516d7948ee Update zh_cn.lang
附魔
2020-03-25 11:21:18 +08:00
Electroblob77 a490168fa2 Derp 2020-03-19 15:46:42 +00:00
Electroblob77 306137a026 Update version number 2020-03-19 15:38:19 +00:00
Electroblob77 0a5527f3d4 Add backwards compatibility to convert old-format atlas markers to new ones 2020-03-19 15:35:09 +00:00
Electroblob77 4dbe24c8ea This is the problem with everything being a string... 2020-03-19 15:13:25 +00:00
Hokorizero 5477725b7e Update zh_cn.lang 2020-03-19 23:08:18 +08:00
Electroblob77 81bba5e7e0 Add null check to ice spikes, fixes #371 2020-03-19 13:35:36 +00:00
Clefal 3dc3a3a378 二次润色,改掉了所有的“咒语”,修改了部分的语法排序 2020-03-19 11:05:59 +08:00
Electroblob77 3151d7d626 Require Antique Atlas 4.6 or newer 2020-03-18 17:18:41 +00:00
Electroblob77 d68f968632 Make sure fall damage stuff is processed on the server only, and reactivate the config option by default 2020-03-18 16:00:23 +00:00
Electroblob77 74d9198522 Convert replaceVanillaFireballs to a synchronised option, fixes #351 2020-03-18 15:50:01 +00:00
Electroblob77 0b56d47022 Replace wildcard with metadata 0 for display purposes, fixes #370
N.B. The output is still not visible for non-zero inputs when using wildcard trades, but for now this is good enough
2020-03-18 15:32:59 +00:00
Electroblob77 587ab1338e Make Magic Protection protect against vanilla magic damage, closes #337 2020-03-18 14:57:04 +00:00
Electroblob77 4816c48aa6 Disable replaceVanillaFallDamage by default 2020-03-18 14:49:12 +00:00
Hokorizero 2456589fa7 Update zh_cn.lang 2020-03-18 17:27:03 +08:00
Hokorizero d7849a94b1 Update zh_cn.lang 2020-03-18 17:13:11 +08:00
Hokorizero cfb9f4fe25 Update zh_cn.lang 2020-03-18 16:47:49 +08:00
Hokorizero a269cf339b Update zh_cn.lang 2020-03-18 16:20:48 +08:00
Hokorizero 1c8e4f86ee Update zh_cn.lang 2020-03-18 15:35:56 +08:00
Hokorizero f2835c245f Update zh_cn.lang 2020-03-18 15:30:49 +08:00
Hokorizero 462512ad30 Update zh_cn.lang 2020-03-18 15:17:43 +08:00
Hokorizero db5a7dcfde Update zh_cn.lang 2020-03-18 15:13:30 +08:00
Hokorizero 17bba5dea8 Update zh_cn.lang 2020-03-18 15:09:18 +08:00
Clefal fbdb5cd844 医命师修改 2020-03-18 14:58:13 +08:00
Hokorizero 393fb1c1b0 Merge pull request #1 from Hokorizero/润色1
润色
2020-03-18 14:56:42 +08:00
Hokorizero 08e89b1aef Update zh_cn.lang 2020-03-18 14:49:55 +08:00
Clefal 1f25d95b1b 润色 2020-03-18 14:48:27 +08:00
Hokorizero 1f3a71797e Update zh_cn.lang 2020-03-18 14:10:51 +08:00
Clefal a821ef2aef 小修改,图片标题,语法润色 2020-03-18 14:07:57 +08:00
Clefal 6845279c49 手册进度→进度 2020-03-18 13:37:24 +08:00
Electroblob77 79b745e005 Randomise y coordinate to search from when spawning structures in 'cavern' dimensions, fixes #372 2020-03-17 23:54:52 +00:00
Electroblob77 6fff0e31d1 *Facepalm* 2020-03-17 23:45:40 +00:00
Electroblob77 11efe56437 Replace old hardcoded spell book text with translation keys, fixes #368 2020-03-17 23:38:25 +00:00
Electroblob77 7f5786c28c Override override override! 2020-03-17 23:22:54 +00:00
Electroblob77 85b49b330a Make tomes of arcana more common in obelisks, shrines and wizard towers, and make tomes generated as loot more likely to be apprentice tier 2020-03-17 23:16:04 +00:00
Electroblob77 d797e72445 Reduce rarity of all structures a bit 2020-03-17 23:13:17 +00:00
Electroblob77 5f21b565cd Make fireballs, large fireballs and iceballs respect the playerBlockDamage config option 2020-03-17 22:44:30 +00:00
Electroblob77 9ed06c9a34 Stop wizards casting heal ally 2020-03-17 22:34:34 +00:00
Electroblob77 50f315666f Fix spanish handbook translations, fixes #365 2020-03-15 19:23:50 +00:00
Electroblob77 62bdbc81e4 Prevent players from picking up items when possessing and prevent players from possessing whilst sneaking, fixes #376 2020-03-15 19:15:28 +00:00