Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from Teahouse-Studios:master #47

Open
wants to merge 190 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
190 commits
Select commit Hold shift + click to select a range
f107dca
Delete zh_ME.lang
RxinnotRstar May 10, 2022
26a85ae
Rxinns的修改 2022-05-11
RxinnotRstar May 10, 2022
aa51ac9
Merge pull request #1 from RxinnotRstar/Rxinns的修改-2022-05-11
RxinnotRstar May 10, 2022
b09d9f0
Update zh_ME.lang
RxinnotRstar May 13, 2022
5c0f475
:sparkles: ci
XxLittleCxX May 18, 2022
15591a8
horn
DoroWolf May 24, 2022
0c89f27
补充
DoroWolf May 24, 2022
acaf22d
UPD
DoroWolf May 24, 2022
efe635a
Update
DoroWolf May 25, 2022
a4a6c05
梗化
DoroWolf May 25, 2022
5c06e1d
Update
DoroWolf May 26, 2022
555f3bf
Update splashes.json
DoroWolf May 26, 2022
e83bdd1
minor
DoroWolf May 26, 2022
cdf6118
更新
DoroWolf May 27, 2022
1f9e86c
UPD
DoroWolf May 27, 2022
9b7b845
minor
DoroWolf May 27, 2022
9f38197
同步JE
DoroWolf May 28, 2022
1a22c68
rename
DoroWolf May 29, 2022
8cc4e60
Update module_manifest.json
DoroWolf May 29, 2022
39e9391
sfc
DoroWolf May 30, 2022
b7d035d
Update module_manifest.json
DoroWolf May 30, 2022
3e8aae9
bagify
DoroWolf May 30, 2022
fe0165c
分离
DoroWolf May 30, 2022
d5482ab
Rename
DoroWolf May 30, 2022
217d35d
Update splashes.json
DoroWolf May 31, 2022
ddfb771
fix
DoroWolf May 31, 2022
c5d35de
Update splashes.json
DoroWolf Jun 3, 2022
a71a13c
sfc
DoroWolf Jun 4, 2022
c2e2fad
sfc
DoroWolf Jun 4, 2022
e0724e4
移植
DoroWolf Jun 4, 2022
caa0539
update version
DoroWolf Jun 4, 2022
1bfeea7
sfc
DoroWolf Jun 6, 2022
e3535bd
fix texture
DoroWolf Jun 6, 2022
2e3bfa4
1.19.0
DoroWolf Jun 10, 2022
021389b
版本同步java
DoroWolf Jun 10, 2022
3483f21
Update splashes.json
DoroWolf Jun 11, 2022
70610e3
playtime
DoroWolf Jun 11, 2022
6995d22
梗化
DoroWolf Jun 11, 2022
977175d
Update README.md
Dianliang233 Jun 15, 2022
39be583
Create FUNDING.yml
Dianliang233 Jun 15, 2022
7ef3799
sfc
DoroWolf Jun 16, 2022
2e56581
sfc
DoroWolf Jun 16, 2022
248b41a
Update zh_ME.lang
DoroWolf Jun 26, 2022
c53d77f
Update zh_ME.lang
DoroWolf Jun 27, 2022
0058868
Update zh_ME.lang
DoroWolf Jun 27, 2022
e3355e3
Update splashes.json
DoroWolf Jun 27, 2022
50f9e68
update
DoroWolf Jun 27, 2022
a936883
update
DoroWolf Jun 27, 2022
e7c1c94
fix
DoroWolf Jun 27, 2022
07c0fe8
update
DoroWolf Jun 27, 2022
ec2f7ed
Update zh_ME.lang
DoroWolf Jun 29, 2022
a04d671
upd
DoroWolf Jun 29, 2022
50cc847
Update suspicious_stew.png
DoroWolf Jun 29, 2022
d252258
Update item_texture.json
DoroWolf Jun 29, 2022
fd2613e
Update add.json
DoroWolf Jun 30, 2022
27d5f28
Update add.json
DoroWolf Jun 30, 2022
bac59ea
Add Technoblade never dies splash text
Dianliang233 Jul 2, 2022
db228fe
Update module_manifest.json
DoroWolf Jul 2, 2022
4839b93
兼容度太低,效果不太必要,难以维护
DoroWolf Jul 2, 2022
c70341e
bagify
DoroWolf Jul 3, 2022
9db79ab
Add priority.txt
Dianliang233 Jul 5, 2022
a410add
Merge branch 'master' of https://github.com/Teahouse-Studios/mcwzh-me…
Dianliang233 Jul 5, 2022
5dd9605
Add notice
Dianliang233 Jul 5, 2022
3c62e98
Update priority.txt
DoroWolf Jul 6, 2022
eb28af9
Improve compatibility
DoroWolf Jul 6, 2022
a40c6da
Merge branch 'master' into master
DoroWolf Jul 6, 2022
7bc5582
Merge pull request #28 from RxinnotRstar/master
DoroWolf Jul 6, 2022
f804f6c
Update zh_ME.lang
DoroWolf Jul 6, 2022
1ce6f0a
upd
DoroWolf Jul 6, 2022
8124f74
a
DoroWolf Jul 6, 2022
9a21fcb
a
DoroWolf Jul 6, 2022
01345b9
Update zh_CN.lang
DoroWolf Jul 6, 2022
a816b5f
Update all to LF EOL
Dianliang233 Jul 7, 2022
929d858
Merge branch 'master' of https://github.com/Teahouse-Studios/mcwzh-me…
Dianliang233 Jul 7, 2022
e067b92
Revert "Update zh_CN.lang"
DoroWolf Jul 7, 2022
aad698a
Revert "Revert "Update zh_CN.lang""
DoroWolf Jul 7, 2022
9879d9f
Merge branch 'master' into Improve-compatibility
DoroWolf Jul 7, 2022
6ab7555
Merge pull request #30 from Teahouse-Studios/Improve-compatibility
DoroWolf Jul 7, 2022
306b950
Bump memepack-builder
Dianliang233 Jul 7, 2022
f7051e3
Update
DoroWolf Jul 7, 2022
0d8151a
Update module_manifest.json
DoroWolf Jul 8, 2022
2bf3208
sfc
DoroWolf Jul 8, 2022
32dded0
Update
DoroWolf Jul 9, 2022
19174d5
Update add.json
DoroWolf Jul 9, 2022
f6bf16c
同步
DoroWolf Jul 10, 2022
ae29a76
sfc
DoroWolf Jul 10, 2022
30f3923
duplicate
DoroWolf Jul 10, 2022
80e8667
revert
DoroWolf Jul 10, 2022
a4924be
sfc
DoroWolf Jul 14, 2022
061426f
sfc
DoroWolf Jul 14, 2022
7190692
同步JE sfc
DoroWolf Jul 15, 2022
7b3d4b4
add bagify
DoroWolf Jul 15, 2022
e09a607
同步JE
DoroWolf Jul 15, 2022
c3f6524
Update add.json
DoroWolf Jul 15, 2022
f4bad3b
补充
DoroWolf Jul 15, 2022
06d6ffc
Update add.json
DoroWolf Jul 15, 2022
6b1c198
同步JE
DoroWolf Jul 15, 2022
f6ebd61
Update
DoroWolf Jul 20, 2022
99249f8
add snowy biome
DoroWolf Jul 21, 2022
1d0ed80
a
DoroWolf Jul 21, 2022
9c8a579
real_grass
DoroWolf Jul 22, 2022
55924ed
upd
DoroWolf Jul 22, 2022
5f5d18c
Update module_manifest.json
DoroWolf Jul 22, 2022
044d2b8
Revert "Update module_manifest.json"
DoroWolf Jul 22, 2022
befc5b9
Update module_manifest.json
DoroWolf Jul 22, 2022
3605736
typo
DoroWolf Jul 22, 2022
3cb288e
warn check
DoroWolf Jul 22, 2022
a129e08
finding bug
DoroWolf Jul 22, 2022
8dbd207
revert
DoroWolf Jul 22, 2022
9dd4a7a
🤔
DoroWolf Jul 22, 2022
310daf8
sfc
DoroWolf Jul 23, 2022
7bbad0d
Update zh_ME.lang
DoroWolf Jul 23, 2022
0d82757
priority
DoroWolf Jul 23, 2022
979d55e
fix bug
DoroWolf Jul 23, 2022
4c83981
fix bug
DoroWolf Jul 23, 2022
159f81a
test🤔
DoroWolf Jul 23, 2022
234bd56
test
DoroWolf Jul 23, 2022
3b619f8
Update module_manifest.json
DoroWolf Jul 23, 2022
66f9e3d
🤔
DoroWolf Jul 23, 2022
4881341
remove bec bug
DoroWolf Jul 24, 2022
d21a12c
rename
DoroWolf Jul 24, 2022
487e0c2
rename
DoroWolf Jul 24, 2022
1c0f89d
Create book_writable.png
DoroWolf Jul 24, 2022
062ddc2
同步
DoroWolf Jul 29, 2022
5160d9f
sfc
DoroWolf Jul 31, 2022
ebc8d12
同步JE
DoroWolf Aug 3, 2022
3941b5b
同步
DoroWolf Aug 3, 2022
65ce077
sfw
DoroWolf Aug 4, 2022
d06d722
Update zh_ME.lang
DoroWolf Aug 4, 2022
bb8b0db
fix bug
DoroWolf Aug 4, 2022
4033e2e
fix potions bug
DoroWolf Aug 4, 2022
8d24a51
rename
DoroWolf Aug 4, 2022
da157b5
Update zh_ME.lang
DoroWolf Aug 4, 2022
96faef7
Update add.json
DoroWolf Aug 4, 2022
14ceeb8
Create terrain_texture.json
DoroWolf Aug 4, 2022
98d5bd6
Sync with MCLangCN
SkyEye-FAST Aug 8, 2022
adcb063
Update
SkyEye-FAST Aug 8, 2022
0ccd625
fix a critical bug
ff98sha Aug 9, 2022
1b37b79
revert: intentional
DoroWolf Aug 10, 2022
2dfb8c5
~
DoroWolf Aug 10, 2022
58b4ded
Update zh_ME.lang
DoroWolf Aug 22, 2022
c0e6730
Update module_manifest.json
DoroWolf Aug 22, 2022
02b8918
Update add.json
DoroWolf Aug 25, 2022
52427d0
Update zh_ME.lang
DoroWolf Aug 26, 2022
a89e74b
模块化
DoroWolf Aug 26, 2022
f962a37
Update zh_ME.lang
DoroWolf Aug 26, 2022
2a31479
描述同步JE
DoroWolf Aug 27, 2022
848a7e9
Update add.json
DoroWolf Aug 27, 2022
f8ae5fc
Update
DoroWolf Aug 31, 2022
422768c
Update splashes.json
DoroWolf Sep 3, 2022
36b0901
Update add.json
DoroWolf Sep 11, 2022
9495a80
Update zh_ME.lang
DoroWolf Oct 3, 2022
c987bbb
卫道士-->辩护者
DoroWolf Oct 21, 2022
25a597a
同步JE
DoroWolf Oct 31, 2022
43285da
Add CodeQL workflow for GitHub code scanning
lgtm-migrator Nov 10, 2022
34fa2a7
beautiful_chicken
DoroWolf Dec 21, 2022
bcbfb83
Update
DoroWolf Dec 21, 2022
dad119d
bump version
DoroWolf Dec 21, 2022
bb9879e
Update manifest.json
DoroWolf Dec 21, 2022
50c43dd
Update splashes.json
DoroWolf Dec 21, 2022
36e4217
半改全
DoroWolf Dec 21, 2022
2f395e4
sort
DoroWolf Dec 23, 2022
d13d1e0
更新連結
DoroWolf Dec 31, 2022
918deb9
minor update
SkyEye-FAST Dec 31, 2022
3e2f888
update
DoroWolf Dec 31, 2022
afd4545
Update zh_ME.lang
DoroWolf Feb 11, 2023
20f6421
Update zh_CN.lang
DoroWolf Feb 11, 2023
d5671d6
Update zh_ME.lang
DoroWolf Feb 11, 2023
2261e50
Update zh_ME.lang
DoroWolf Feb 11, 2023
8d496e3
Update zh_ME.lang
DoroWolf Feb 11, 2023
64c99a0
sfc
DoroWolf Feb 11, 2023
450fad0
sfw
DoroWolf Feb 11, 2023
c34833d
fix ci
AlPha5130 Feb 11, 2023
ea6aa3b
fix ci missing step
AlPha5130 Feb 11, 2023
a1236bd
Update zh_ME.lang
Jingji132 Feb 18, 2023
2d52d61
Merge pull request #34 from lgtm-migrator/codeql
AlPha5130 Feb 18, 2023
4bfd5f0
Update test_ci.yml
AlPha5130 Feb 18, 2023
c6c626a
Update zh_ME.lang
Jingji132 Feb 20, 2023
ca85046
Update
DoroWolf May 14, 2023
f5fb34e
Sync modules
SkyEye-FAST May 20, 2023
5e0dffd
Sync with MCLangCN
SkyEye-FAST May 20, 2023
2a7dc03
fix lock
XxLittleCxX May 20, 2023
a56bfeb
Update & Sync with MCLangCN
SkyEye-FAST May 20, 2023
cbc46e3
Duplicate
SkyEye-FAST May 20, 2023
3668c3e
sync
DoroWolf Jun 10, 2023
69d1dff
bump version
DoroWolf Jun 10, 2023
c4c677e
Update splashes.json
DoroWolf Jun 10, 2023
5a1f55b
更新README.md
OKHI233 Feb 18, 2024
75bf30d
好像链接替换多了
OKHI233 Feb 18, 2024
57cba36
Merge pull request #40 from OKHI233/patch-1
AlPha5130 Dec 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[*]
end_of_line = lf
indent_style = space
indent_size = 4

[*.js]
indent_size = 2

[*.yaml]
indent_size = 2
14 changes: 14 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
- https://afdian.net/@teahouse
41 changes: 41 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: "CodeQL"

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]
schedule:
- cron: "5 9 * * 4"

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ python ]

steps:
- name: Checkout
uses: actions/checkout@v3

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
queries: +security-and-quality

- name: Autobuild
uses: github/codeql-action/autobuild@v2

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
category: "/language:${{ matrix.language }}"
26 changes: 0 additions & 26 deletions .github/workflows/deploy.yml

This file was deleted.

71 changes: 40 additions & 31 deletions .github/workflows/test_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: Test Build CI

on:
push:
branches: [ master ]
pull_request:

jobs:
Expand All @@ -11,33 +10,43 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: Set up Python 3.9
uses: actions/setup-python@v2
with:
python-version: 3.9

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install flake8
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi

- name: Lint with flake8
run: |
# stop the build if there are Python syntax errors or undefined names
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics

- name: Test build
run: |
python preset_build.py

- name: Upload files built
uses: actions/upload-artifact@v2
with:
name: files-built
path: |
builds
- uses: actions/checkout@v3

- uses: pnpm/action-setup@v2
with:
version: latest

- uses: actions/setup-node@v3
with:
node-version: 18
cache: pnpm

- name: Install dependencies
run: |
pnpm install

- name: Test build
run: |
pnpm run test-build

- name: Upload files built
uses: actions/upload-artifact@v3
with:
name: files-built
path: |
builds
deploy:
if: ${{ github.event_name == 'push' && github.ref_name == 'master' }}
needs:
- test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: Update Deployment Status
run: |
curl \
-X POST \
-H "Authorization: token ${{secrets.GITHUB_TOKEN}}" \
-H "Accept: application/vnd.github.v3+json" \
https://api.github.com/repos/${{github.repository}}/deployments \
-d '{"ref":"${{ github.sha }}", "required_contexts": []}'
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ Include/
Lib/
Scripts/
pyvenv.cfg
node_modules
18 changes: 18 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"semi": false,
"useTabs": false,
"singleQuote": true,
"trailingComma": "all",
"tabWidth": 2,
"printWidth": 80,
"endOfLine": "lf",
"overrides": [
{
"files": "*.json",
"options": {
"tabWidth": 4,
"useTabs": false
}
}
]
}
37 changes: 18 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,22 @@
此资源包仅适用于**Minecraft基岩版**。

* 关于适用于Minecraft Java版的资源包,参见[Java版梗体中文](https://github.com/Teahouse-Studios/mcwzh-meme-resourcepack)。
* 关于Minecraft基岩版的翻译问题,详见[译名标准化/基岩版](https://minecraft-zh.gamepedia.com/MCW:译名标准化/基岩版)。
* 关于Minecraft基岩版的翻译问题,详见[译名标准化/基岩版](https://zh.minecraft.wiki/w/Minecraft_Wiki:译名标准化/基岩版)。
* 关于Minecraft基岩版的简体中文修正,参见中文Minecraft Wiki行政员Ff98sha制作的[基岩版译名修正](https://github.com/ff98sha/mclangcn)。
* 关于Minecraft基岩版的繁体中文修正,参见小俊AUA制作的[此资源附加包](https://forum.gamer.com.tw/C.php?bsn=18673&snA=183269)。
* 关于Minecraft基岩版的全语言修正,参见俄语Crowdin校对员fromgate制作的[Translations for Minecraft (Bedrock)](https://www.curseforge.com/minecraft/mc-addons/translations-for-minecraft)。
* 关于Minecraft基岩版的全语言修正,参见俄语Crowdin校对员fromgate制作的[Translations for Minecraft (Bedrock)](https://www.curseforge.com/minecraft-bedrock/addons/translations-for-minecraft)。

## 赞助者
<p align="center">
<a href="https://afdian.net/@teahouse">
<img src='https://fe.wd-ljt.com/m3me/sP0ns0r5/sP0ns0r5.svg'>
</a>
</p>

## 注意

* 本资源包**仅供娱乐**,请勿将其可能存在的误导性内容当真。
* 若发现自身可能存在该资源包上头的情况,**请立刻~~食用~~阅读[译名标准化](https://minecraft.fandom.com/zh/wiki/MCW:译名标准化)**。
* 若发现自身可能存在该资源包上头的情况,**请立刻~~食用~~阅读[译名标准化](https://zh.minecraft.wiki/w/Minecraft_Wiki:译名标准化)**。
* 在使用本资源包的过程中,若难以理解被修改后的内容,**请及时在设置中将语言改回简体中文**。
* 本资源包的内容大部分参照于其[Java版的版本](https://github.com/Teahouse-Studios/mcwzh-meme-resourcepack),另外加入了一些适配于基岩版的内容。
* 若无特殊说明,下文中“Minecraft”皆指**Minecraft基岩版**,“资源包”皆指附加包中的类型之一。
Expand Down Expand Up @@ -91,32 +98,24 @@

#### 先决条件

请确保已经安装了Python 3.9+和Git。如果没有,请到[Python官网](https://www.python.org)和[Git官网](https://www.git-scm.com)下载。
请确保已经安装了NodeJS主流版本和Git。如果没有,请到[NodeJS官网](https://nodejs.org/zh-cn/)和[Git官网](https://www.git-scm.com)下载。

#### 步骤

1. 下载源码;
2. 进入文件夹;
3. 安装相关pip依赖
3. 安装相关依赖
4. 运行预设打包命令。

``` sh
git clone https://github.com/Teahouse-Studios/mcwzh-meme-resourcepack-bedrock.git
cd mcwzh-meme-resourcepack-bedrock
pip install -r requirements.txt
python preset_build.py
git clone https://github.com/Teahouse-Studios/mcwzh-meme-resourcepack.git
cd mcwzh-meme-resourcepack
npm install
node preset_build.js
```

在文件夹中会出现 `meme-resourcepack.zip` 、 `meme-resourcepack_noresource.zip` 、 `meme-resourcepack.mcpack` 和 `meme-resourcepack_noresource.mcpack` 等资源包,名称和作用如上所述。

如果需要预设以外的资源包,可输入需要的参数:

``` bash
python -m memepack_builder ...
```

具体用法可见[此处](https://github.com/Teahouse-Studios/memepack-builder/blob/main/doc/CLI_Manual.zh-hans.md)。

## 贡献

我们欢迎您为这个资源包贡献自己的想法。请参阅[`CONTRIBUTING.md`](./CONTRIBUTING.md)以获取一些建议。
Expand All @@ -127,8 +126,8 @@ python -m memepack_builder ...
* 本资源包与其[Java版的版本](https://github.com/Teahouse-Studios/mcwzh-meme-resourcepack)相比可能更新较慢并且缺少一些内容。
* 缺少的内容可能是由于基岩版本身就缺少这些字符串,也可能是移植时的疏忽造成的,如果遇到这些情况请您积极提交议题反馈。
* 同理,Java版的内容也可能缺少基岩版的内容。
* 本资源包与Mojang、Minecraft Wiki、Gamepedia和Fandom无关,原中文翻译版权为Mojang和翻译者所有。
* 关于正确的译名,请参见[中文Minecraft Wiki的译名标准化](https://minecraft-zh.gamepedia.com/MCW:译名标准化)。
* 本资源包与Mojang、Minecraft Wiki和Weird Gloop无关,原中文翻译版权为Mojang和翻译者所有。
* 关于正确的译名,请参见[中文Minecraft Wiki的译名标准化](https://zh.minecraft.wiki/w/Minecraft_Wiki:译名标准化)。
* 本项目文件除另有声明外,均以 ***CC BY-SA 4.0*** 协议授权。
* 这意味着,您可在署名的情况下自由修改本资源包,但是您再创作的作品必须以本协议发布。
* 这不是法律建议。
Expand Down
Loading