-
-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'refs/remotes/origin/1.20.1/dev' into Da…
…udeuf/1.20.1/dev # Conflicts: # common/src/main/java/dev/ithundxr/createnumismatics/content/backend/Coin.java # common/src/main/java/dev/ithundxr/createnumismatics/content/vendor/VendorBlockEntity.java
- Loading branch information
Showing
152 changed files
with
5,638 additions
and
358 deletions.
There are no files selected for viewing
6 changes: 3 additions & 3 deletions
6
common/src/generated/resources/.cache/630af4bded938901e0e1fd57c58a2ac245292828
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
// 1.20.1 2024-07-03T10:53:15.138751138 Create: Numismatics/Numismatics' Advancements | ||
8f32fb49ef81058e2e660fac983dbef2f554db38 data/numismatics/advancements/root.json | ||
// 1.20.1 2024-07-21T07:28:28.810770107 Create: Numismatics/Numismatics' Advancements | ||
4ab84595dc44460d6d89ff3608940dd8694b93d6 data/numismatics/advancements/is_this_legal.json | ||
645c92e6e449889ed4cf617432fd6fa87ffe355b data/numismatics/advancements/questionable_investment.json | ||
8f32fb49ef81058e2e660fac983dbef2f554db38 data/numismatics/advancements/root.json | ||
894790d980b33b5cc24a21937c7db72bf0af1c5a data/numismatics/advancements/money_laundering.json | ||
4ab84595dc44460d6d89ff3608940dd8694b93d6 data/numismatics/advancements/is_this_legal.json |
150 changes: 91 additions & 59 deletions
150
common/src/generated/resources/.cache/6ba62358bf8e130d42215f5f9edbedd611809677
Large diffs are not rendered by default.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
common/src/generated/resources/.cache/c6e4c19894bc5aece2976a0277ba8e1dbf023865
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
// 1.20.1 2024-07-03T10:53:15.138642657 Create: Numismatics/Numismatics' Sequenced Assembly Recipes | ||
// 1.20.1 2024-07-21T07:28:28.810455961 Create: Numismatics/Numismatics' Sequenced Assembly Recipes |
176 changes: 97 additions & 79 deletions
176
common/src/generated/resources/.cache/d6a1ec2d08c6d6d7facbde77dda6f0158c00bbd6
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.