Skip to content

Commit

Permalink
Update all to LF EOL
Browse files Browse the repository at this point in the history
  • Loading branch information
Dianliang233 committed Jul 7, 2022
1 parent 161f2d3 commit 28a9a22
Show file tree
Hide file tree
Showing 22 changed files with 464 additions and 444 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[*]
end_of_line = crlf
end_of_line = lf
indent_style = space
indent_size = 4

Expand Down
4 changes: 2 additions & 2 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"semi": false,
"useTabs": false,
"singleQuote": true,
"trailingComma": "es5",
"trailingComma": "all",
"tabWidth": 2,
"printWidth": 80,
"endOfLine": "crlf",
"endOfLine": "lf",
"overrides": [
{
"files": "*.json",
Expand Down
2 changes: 1 addition & 1 deletion meme_resourcepack/assets/realms/lang/zh_meme.json
Original file line number Diff line number Diff line change
Expand Up @@ -232,4 +232,4 @@
"mco.upload.size.failure.line2": "你想上传%s的地图,超过了%s的限制。",
"mco.upload.uploading": "正在上传 '%s'",
"mco.upload.verifying": "正在验证你的地图"
}
}
6 changes: 3 additions & 3 deletions mods/no_chat_report.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"gui.nochatreport.secureChat": "阿伟你又在菊♂爆哦,休息一下吧。"
}
{
"gui.nochatreport.secureChat": "阿伟你又在菊♂爆哦,休息一下吧。"
}
2 changes: 1 addition & 1 deletion modules/bagify/module_manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"name": "bagify",
"type": "resource",
"description": "帮你把所有粉末装到袋子里",
"author": ["SkyEye_FAST","DoroWolf"]
"author": ["SkyEye_FAST", "DoroWolf"]
}
4 changes: 2 additions & 2 deletions modules/choice_module_netease/module_manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
"bee_pickaxe",
"bell_sound",
"brewing_stand_model",
"chicken_soup",
"chicken_soup",
"disco_ball",
"dorowolf_texture",
"famous_scene",
"firework_sound",
"glyph_sizes_fix",
"goat_horn_sound",
"goat_horn_sound",
"lang_netease",
"locusazzurro",
"map_override",
Expand Down
2 changes: 1 addition & 1 deletion modules/disco_ball/module_manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"name": "disco_ball",
"type": "resource",
"description": "红石灯球,有动态材质的那种",
"author": ["Gu_ZT", "Zh9c418","DoroWolf"]
"author": ["Gu_ZT", "Zh9c418", "DoroWolf"]
}
20 changes: 10 additions & 10 deletions modules/goat_horn_sound/add.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"instrument.minecraft.admire_goat_horn": "威廉",
"instrument.minecraft.call_goat_horn": "山羊",
"instrument.minecraft.dream_goat_horn": "雷霆",
"instrument.minecraft.feel_goat_horn": "欢呼",
"instrument.minecraft.ponder_goat_horn": "喇叭",
"instrument.minecraft.seek_goat_horn": "失败",
"instrument.minecraft.sing_goat_horn": "出场",
"instrument.minecraft.yearn_goat_horn": "恐龙"
}
{
"instrument.minecraft.admire_goat_horn": "威廉",
"instrument.minecraft.call_goat_horn": "山羊",
"instrument.minecraft.dream_goat_horn": "雷霆",
"instrument.minecraft.feel_goat_horn": "欢呼",
"instrument.minecraft.ponder_goat_horn": "喇叭",
"instrument.minecraft.seek_goat_horn": "失败",
"instrument.minecraft.sing_goat_horn": "出场",
"instrument.minecraft.yearn_goat_horn": "恐龙"
}
4 changes: 1 addition & 3 deletions modules/goat_horn_sound/module_manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
"name": "goat_horn_sound",
"type": "resource",
"description": "山羊角的音效(音量注意)",
"author": [
"DoroWolf"
],
"author": ["DoroWolf"],
"languageModification": [
{
"file": "assets/minecraft/lang/zh_meme.json",
Expand Down
Loading

0 comments on commit 28a9a22

Please sign in to comment.