Skip to content

Commit ddfa3e3

Browse files
doc-bokdoc-bok
committed
Merge branch 'main' into Minecraft-1.20.2
2 parents dea9c84 + a300551 commit ddfa3e3

3,151 files changed

Lines changed: 39093 additions & 37346 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/qodana_code_quality.yml‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,8 @@ forge*changelog.txt
3232
*.bbmodel
3333

3434
# Python
35-
__pycache__
35+
__pycache__
36+
37+
# Files from data generation
38+
run-data
39+
/src/generated/resources/.cache

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ mod_name=Butterfly Mod
4848
# The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
4949
mod_license=All Rights Reserved
5050
# The mod version. See https://semver.org/
51-
mod_version=7.6.0
51+
mod_version=7.7.1
5252
# The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
5353
# This should match the base package used for the mod sources.
5454
# See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/main/resources/assets/butterflies/blockstates/bottled_butterfly_admiral.json renamed to src/generated/resources/assets/butterflies/blockstates/bottled_butterfly_admiral.json

File renamed without changes.

src/main/resources/assets/butterflies/blockstates/bottled_butterfly_atlas.json renamed to src/generated/resources/assets/butterflies/blockstates/bottled_butterfly_atlas.json

File renamed without changes.

src/main/resources/assets/butterflies/blockstates/bottled_butterfly_bluemoon.json renamed to src/generated/resources/assets/butterflies/blockstates/bottled_butterfly_bluemoon.json

File renamed without changes.

src/main/resources/assets/butterflies/blockstates/bottled_butterfly_bluemoonmale.json renamed to src/generated/resources/assets/butterflies/blockstates/bottled_butterfly_bluemoonmale.json

File renamed without changes.

src/main/resources/assets/butterflies/blockstates/bottled_butterfly_buckeye.json renamed to src/generated/resources/assets/butterflies/blockstates/bottled_butterfly_buckeye.json

File renamed without changes.

src/main/resources/assets/butterflies/blockstates/bottled_butterfly_cabbage.json renamed to src/generated/resources/assets/butterflies/blockstates/bottled_butterfly_cabbage.json

File renamed without changes.

0 commit comments

Comments
 (0)