Skip to content

Commit

Permalink
Revert "[Formatter]Update file"
Browse files Browse the repository at this point in the history
This reverts commit db1c131.
  • Loading branch information
mamaruo committed Apr 12, 2023
1 parent db1c131 commit d3b7e64
Show file tree
Hide file tree
Showing 319 changed files with 27,734 additions and 22,244 deletions.
2 changes: 1 addition & 1 deletion projects/1.12.2/assets/banhammer/banhammer/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ itemGroup.banhammer=BanHammer
modifier.banhammer.ban.name=BanHammer
modifier.banhammer.ban.desc=The joy of running after a player to ban him is here!
modifier.banhammer.kick.name=KickHammer
modifier.banhammer.kick.desc=Hit the player to kick him :)
modifier.banhammer.kick.desc=Hit the player to kick him :)
2 changes: 2 additions & 0 deletions projects/1.12.2/assets/cofh-core/cofh/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,8 @@ potion.effect.resistance=Potion of Resistance
potion.effect.unluck=Potion of Misfortune
potion.effect.wither=Potion of Decay

potion.potency.3=IV
potion.potency.4=V

splash_potion.effect.absorption=Splash Potion of Absorption
splash_potion.effect.haste=Splash Potion of Haste
Expand Down
2 changes: 2 additions & 0 deletions projects/1.12.2/assets/cofh-core/cofh/lang/zh_cn.lang
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,8 @@ potion.effect.haste=急迫药水
potion.effect.resistance=抗性提升药水
potion.effect.unluck=不幸药水
potion.effect.wither=衰败药水
potion.potency.3=IV
potion.potency.4=V
splash_potion.effect.absorption=喷溅型伤害吸收药水
splash_potion.effect.haste=喷溅型急迫药水
splash_potion.effect.resistance=喷溅型抗性提升药水
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ dynamistics.category.title.pauto.process=Package Processing
dynamistics.category.title.pauto.holder=Packaged Recipe

dynamistics.recipe.text.package_processing_extra=Recipe %s:
dynamistics.recipe.text.show_jei_categories=Show Recipes
dynamistics.recipe.text.show_jei_categories=Show Recipes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
tile.enderhopper:enderhopper.name=Ender Hopper
tile.enderhopper:enderhopper.name=Ender Hopper
Original file line number Diff line number Diff line change
@@ -1 +1 @@
tile.enderhopper:enderhopper.name=末影漏斗
tile.enderhopper:enderhopper.name=末影漏斗
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ item.snail_shell.name=蜗牛壳
item.turkey_leg_raw.name=生火鸡腿
item.turkey_leg_cooked.name=熟火鸡腿
item.venison_raw.name=生鹿肉
item.venison_cooked.name=熟鹿肉
item.venison_cooked.name=熟鹿肉
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tile.framedcompactdrawers.framed_compact_drawer.name=Framed Compacting Drawer
tile.framedcompactdrawers.framed_drawer_controller.name=Framed Drawer Controller
tile.framedcompactdrawers.framed_slave.name=Framed Controller Slave
itemGroup.framed_compacting_drawers=Framed Compacting Drawers
itemGroup.framed_compacting_drawers=Framed Compacting Drawers
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
tile.framedcompactdrawers.framed_compact_drawer.name=镶框压缩抽屉
tile.framedcompactdrawers.framed_drawer_controller.name=镶框抽屉控制器
tile.framedcompactdrawers.framed_slave.name=镶框控制器传动方块
itemGroup.framed_compacting_drawers=镶框压缩抽屉
itemGroup.framed_compacting_drawers=镶框压缩抽屉
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ gregtechsieves.machine.sieve.iv.name=Advanced Electric Sieve IV
gregtechsieves.machine.sieve.luv.name=Advanced Electric Sieve V
gregtechsieves.machine.sieve.zpm.name=Advanced Electric Sieve VI
gregtechsieves.machine.sieve.uv.name=Advanced Electric Sieve VII
recipemap.electric_sieve.name=Electric Sieve
recipemap.electric_sieve.name=Electric Sieve
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ gregtechsieves.machine.sieve.iv.name=进阶电动筛子 IV
gregtechsieves.machine.sieve.luv.name=进阶电动筛子 V
gregtechsieves.machine.sieve.zpm.name=进阶电动筛子 VI
gregtechsieves.machine.sieve.uv.name=进阶电动筛子 VII
recipemap.electric_sieve.name=电动筛子
recipemap.electric_sieve.name=电动筛子
Original file line number Diff line number Diff line change
Expand Up @@ -3006,6 +3006,9 @@ dcs.comment.debug_gauntlet.0=FOR DEBUGGING ONLY!
dcs.comment.flavor.debug_gauntlet.0="I can't work without it."

##vanilla
potion.potency.3=IV
potion.potency.4=V
potion.potency.5=VI
potion.potency.6=VII
potion.potency.7=VIII
potion.potency.8=IX
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,7 @@ tile.dcs_ore2_stone_9.name=辉铋矿石
tile.dcs_ore2_stone_10.name=铝土矿石
tile.dcs_ore2_stone_11.name=金红石水晶矿石
tile.dcs_ore2_stone_12.name=鸟粪石
#
//
tile.dcs_dustblock_copper.name=铜粉块
tile.dcs_dustblock_zinc.name=锌粉块
tile.dcs_dustblock_nickel.name=镍粉块
Expand Down Expand Up @@ -3021,6 +3021,9 @@ dcs.comment.debug_gauntlet.0=测试专用,正常游戏时不可获取
dcs.comment.flavor.debug_gauntlet.0=“没有这个就不能工作”

##vanilla
potion.potency.3=IV
potion.potency.4=V
potion.potency.5=VI
potion.potency.6=VII
potion.potency.7=VIII
potion.potency.8=IX
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,4 @@ hap.config.recipe_crusher=Hammer Mill Ore Recipes
hap.config.recipe_blacklist=Ore Recipes Blacklist
#
# JEI
hap.plugin.jei.coke_oven=Coke Oven
hap.plugin.jei.coke_oven=Coke Oven
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,4 @@ hap.config.recipe_crusher=锤式粉碎机矿石配方
hap.config.recipe_blacklist=矿石配方黑名单
#
# JEI
hap.plugin.jei.coke_oven=焦炉
hap.plugin.jei.coke_oven=焦炉
2 changes: 1 addition & 1 deletion projects/1.12.2/assets/lootr/lootr/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ lootr.commands.usage=/lootr chest | chest <loot-table> | cart | cart <loot-table
lootr.commands.create=Created a Lootr %s at %s using the loot table %s.
lootr.commands.summon=Summoned a Lootr Cart at %s using the loot table %s.
lootr.commands.blockpos=[%s, %s, %s]
itemGroup.lootr=Lootr
itemGroup.lootr=Lootr
2 changes: 1 addition & 1 deletion projects/1.12.2/assets/lootr/lootr/lang/zh_cn.lang
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ lootr.commands.usage=/lootr chest | chest <战利品表> | cart | cart <战利
lootr.commands.create=已使用战利品表 %3$s 于 %2$s 处创建出了 Lootr 的%1$s。
lootr.commands.summon=已使用战利品表 %3$s 于 %2$s 处生成出了 Lootr 矿车的%1$s。
lootr.commands.blockpos=[%s, %s, %s]
itemGroup.lootr=Lootr
itemGroup.lootr=Lootr
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ playerhopper.mode.armor_hotbar=Armor & Hotbar
playerhopper.mode.hotbar_inventory=Hotbar & Inventory
playerhopper.mode.armor_inventory=Armor & Inventory
playerhopper.mode.armor=Armor
playerhopper.mode.hotbar=Hotbar
playerhopper.mode.hotbar=Hotbar
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ playerhopper.mode.armor_hotbar=装备栏和快捷栏
playerhopper.mode.hotbar_inventory=快捷栏和物品栏
playerhopper.mode.armor_inventory=装备栏和物品栏
playerhopper.mode.armor=装备栏
playerhopper.mode.hotbar=快捷栏
playerhopper.mode.hotbar=快捷栏
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
itemGroup.pullutantpump=Pollutant Pump
tile.pump.name=Pollutant Pump
tile.pipe.name=Pump Pipe
tile.pipe.name=Pump Pipe
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
itemGroup.pullutantpump=污染物泵
tile.pump.name=污染物泵
tile.pipe.name=污染物导管
tile.pipe.name=污染物导管
2 changes: 1 addition & 1 deletion projects/1.12.2/assets/tatami/tatami/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ item.tatami:tatami_full.name=Tatami Mat
tile.tatami:panel_floral.name=Shoji Panel
tile.tatami:panel_plain.name=Shoji Panel
tile.tatami:panel_tiled.name=Shoji Panel
item.tatami:panel_door.name=Shoji Door
item.tatami:panel_door.name=Shoji Door
2 changes: 1 addition & 1 deletion projects/1.12.2/assets/tatami/tatami/lang/zh_cn.lang
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ item.tatami:tatami_full.name=榻榻米垫
tile.tatami:panel_floral.name=障子板
tile.tatami:panel_plain.name=障子板
tile.tatami:panel_tiled.name=障子板
item.tatami:panel_door.name=障子门
item.tatami:panel_door.name=障子门
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
item.toolprogression.magic_mushroom.name=Magic™ Mushroom
modifier.magicmushroom.name=Magic™ Mushroom
modifier.magicmushroom.desc=This amazing mushroom can magically increase the capabilities of your tools.
modifier.magicmushroom.desc=This amazing mushroom can magically increase the capabilities of your tools.
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
item.toolprogression.magic_mushroom.name=魔法™蘑菇
modifier.magicmushroom.name=魔法™蘑菇
modifier.magicmushroom.desc=这种神奇的蘑菇可以神奇地提高你的工具的能力。
modifier.magicmushroom.desc=这种神奇的蘑菇可以神奇地提高你的工具的能力。
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ item.leech.name=Leech
item.leather_glove.name=Leather Glove
item.iron_glove.name=Iron Glove
item.gold_glove.name=Gold Glove
item.diamond_glove.name=Diamond Glove
item.diamond_glove.name=Diamond Glove
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
{
"type": "plainclone",
"source": "./projects/1.16/assets/cloth-config/cloth-config2"
}
{"type":"plainclone","source":"./projects/1.16/assets/cloth-config/cloth-config2"}
Loading

0 comments on commit d3b7e64

Please sign in to comment.