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

Update to 1.20.5 #993

Merged
merged 101 commits into from
May 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
2450f4b
Apply overlays
misode Mar 21, 2024
9758e74
Update version numbers and pack format for 1.20.5
misode Mar 21, 2024
b03aa25
Update all tests to 1.20.5
misode Mar 22, 2024
60704f0
Temporarily disable player heads plugins
misode Mar 22, 2024
7b656d8
Fix location predicates
misode Mar 22, 2024
4fd0871
Fix nested loot tables
misode Mar 22, 2024
cfb134b
Fix set lore mode field
misode Mar 22, 2024
ff5eff8
Fix block/fluid/item predicates
misode Mar 22, 2024
c4b5402
Fix attribute operations
misode Mar 22, 2024
0ece391
Potion contents item sub predicates
misode Mar 22, 2024
bc1423f
Enchantment item sub predicates
misode Mar 22, 2024
993d196
Advancement icons
misode Mar 22, 2024
f07c868
Sweeping edge rename
misode Mar 22, 2024
8365701
Update yellow shulker box loot table
misode Mar 22, 2024
a9f2003
Fix set_nbt loot functions
misode Mar 23, 2024
119063c
Fix component issues with last commit
misode Mar 23, 2024
163019e
Upgrade custom model data substitutions
misode Mar 25, 2024
8730062
Fix advancement icon components
misode Mar 25, 2024
acf1fb7
More set_nbt fixes
misode Apr 2, 2024
38dd2e3
Misc errors
misode Apr 2, 2024
8708ca5
Replace horse jump strength attribute with max_stack_size=1
misode Apr 2, 2024
ff8a3cc
Remove lib player heads, update skin cache plugin
misode Apr 2, 2024
eceda8d
Fix item predicate NBT field to sub predicates
misode Apr 2, 2024
619e60b
Count -> count
misode Apr 3, 2024
9bbbd08
scute -> turtle_scute
misode Apr 3, 2024
fe9a1dd
Fix remaining issues in loot table, recipe, advancements ignoring cop…
misode Apr 4, 2024
a43daca
Fix attribute operations in commands
misode Apr 4, 2024
31750ef
Update mecha
misode Apr 5, 2024
1c9b81e
Update copy_nbt in better armour stands, boots of ostara, chairs, and…
misode Apr 5, 2024
fadf082
Update copy_nbt in arborenda and mountaineering
misode Apr 7, 2024
e18c710
Metallurgy item validity + update commands
misode Apr 8, 2024
220a9c4
Update item nbt checks in a few places + sunken treasure
misode Apr 8, 2024
e96a648
Update lib trades, DecorItem -> body_armor_item
misode Apr 8, 2024
83757b6
Lib trees
misode Apr 8, 2024
c332f87
A bunch of tag -> components
misode Apr 8, 2024
3d5c6c9
Fix machine block placing
misode Apr 12, 2024
bc4b2e1
More tag -> components fixes + re-add b suffix in set_custom_data
misode Apr 13, 2024
10772dd
Update mecha
misode Apr 13, 2024
aa336f4
Update particle syntax
misode Apr 13, 2024
b587342
Display frames + lightning in a bottle
misode Apr 13, 2024
5a284f7
Update to java 21 and 1.20.5-pre1
misode Apr 14, 2024
b926049
Fix int providers no long wrapped in value field
misode Apr 14, 2024
1c237b8
Fix remaining particle commands
misode Apr 14, 2024
11dbbbb
Update yellow shulker box loot table
misode Apr 15, 2024
1fbc49f
Merge branch 'master' of https://github.com/Gamemode4Dev/GM4_Datapack…
misode Apr 23, 2024
475d55b
Some balloon animals updates
misode Apr 24, 2024
08e5b97
Update packtest to 1.20.5
misode Apr 24, 2024
d32e30f
Fix some errors in the tests
misode Apr 24, 2024
6ef8788
Even more tag -> components fixes
misode Apr 24, 2024
2920d48
Final tag -> components fixes (except combat expanded)
misode Apr 25, 2024
b05d147
Temporarily disable guidebook copy_nbt functions
misode Apr 25, 2024
e723e18
Fix some leftover item nbt
misode Apr 25, 2024
ce80e9b
biome -> biomes, structure -> structures, potion
misode Apr 25, 2024
f9d1bb3
Fix some more tests
misode Apr 25, 2024
2125acd
Combat expanded tag -> components fixes
misode Apr 25, 2024
4a26416
Replace CMD in item components
misode Apr 25, 2024
6cb8ced
Fix particles in area effect clouds
misode Apr 25, 2024
ba800de
Replace some item_used_on_block with default_block_use
misode Apr 26, 2024
734b4cc
Fix a few more tests
misode Apr 28, 2024
341e58a
Fix auto crafting item tag predicates
misode Apr 28, 2024
4b5a74a
Random fixes (enchantment checks, phantom scarecrows, animi)
misode Apr 28, 2024
c1b08a7
Fix area effect cloud NBT
misode Apr 28, 2024
3181a74
Fix custom GUI fonts
misode Apr 30, 2024
f6a8de3
Update beet and support 1.20.6
misode May 2, 2024
8e9ea35
Remove non-modules from build artifact
misode May 2, 2024
3d51dd9
Substitute profile data in mcfunction files
misode May 2, 2024
98249f9
Update biome extensions to 1.20.5
misode May 2, 2024
e64b23c
Remove debug commands in cozy campfires
misode May 4, 2024
814d690
Fix poses pack and bookshelf book title
misode May 4, 2024
8da74dc
Allow module aliases in beet dev
misode May 4, 2024
2133466
Fix boots of ostara crafting
misode May 4, 2024
0a621ea
Fix washing tanks not clearing dyed_color component
misode May 5, 2024
e33df3b
Keep boots custom name when crafting boots of ostara
misode May 6, 2024
d426e13
Fix soul glass has_beam predicate
misode May 6, 2024
f9f5706
Fix block compressors
misode May 6, 2024
40aee67
Fix Tunnel Bores item drops
SpecialBuilder32 May 7, 2024
9dd4ba8
Fix tinkering compressors
SpecialBuilder32 May 7, 2024
8bcdf07
Remove redundant tc check
SpecialBuilder32 May 7, 2024
119fdec
Fix bookshelf inspectors
SpecialBuilder32 May 7, 2024
f59d372
Fix: Liquid Minecart breaking, glow ink signs, floating potion advanc…
SpecialBuilder32 May 7, 2024
0732a6e
Lightning in a bottle 1.20.5 (#997)
EpyonProjects May 7, 2024
25aba53
Refactor supported versions and releases in beet.yaml
misode May 7, 2024
bd3f185
Disable trouble modules
misode May 7, 2024
684454b
Minor version bump for all modules
misode May 7, 2024
fb01520
Fix Relocators loot function (#999)
EpyonProjects May 7, 2024
e315986
Update Balloon Animals to 1.20.5 (#998)
EpyonProjects May 7, 2024
75a36d6
Fix crossbow cartridges tnt fuse
misode May 8, 2024
0426801
Fix typo in record crafting
misode May 8, 2024
2fa5349
Update beet to use latest vanilla assets
misode May 9, 2024
75a6b86
Various fixes (moneo, standard crafting, teleportation anchors, dange…
misode May 9, 2024
ca60d3d
Book Binders: 1.20.5 update (#1000)
EpyonProjects May 15, 2024
bf502d1
Update mecha to 0.94.2
misode May 15, 2024
b0736c9
Combat Expanded 1.20.5 (#996)
TheThanathor May 15, 2024
fa84960
Disable zauber and guidebook in tests
misode May 15, 2024
df47eba
Switch to the ubuntu-24.04 beta runner
misode May 15, 2024
41964ac
Fix mountaineering crafting recipe
misode May 27, 2024
2bbf248
Merge branch 'master' of https://github.com/Gamemode4Dev/GM4_Datapack…
misode May 27, 2024
c47400d
Revert debug logging
misode May 27, 2024
9330c54
Store block compressor old components in a new field and merge old ta…
misode May 27, 2024
51da4ed
Remove tnt landmines
misode May 27, 2024
e069675
Remove trapped signs
misode May 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 16 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ on:
workflow_dispatch:

env:
VERSION: '1.20'
VERSION: '1.20.5'
COMMIT_MSG: ${{ github.event.head_commit.message }}
TEST_FABRIC_SERVER: https://meta.fabricmc.net/v2/versions/loader/1.20.4/0.15.3/0.11.2/server/jar
TEST_FABRIC_API: https://cdn.modrinth.com/data/P7dR8mSH/versions/JMCwDuki/fabric-api-0.92.0%2B1.20.4.jar
TEST_PACKTEST: https://cdn.modrinth.com/data/XsKUhp45/versions/18smpIeE/packtest-1.6-mc1.20.4.jar
TEST_FABRIC_SERVER: https://meta.fabricmc.net/v2/versions/loader/1.20.6/0.15.10/1.0.1/server/jar
TEST_FABRIC_API: https://cdn.modrinth.com/data/P7dR8mSH/versions/kAQqRNrK/fabric-api-0.97.8%2B1.20.6.jar
TEST_PACKTEST: https://cdn.modrinth.com/data/XsKUhp45/versions/UnZw9eUD/packtest-1.7-mc1.20.5.jar

jobs:
build:
Expand Down Expand Up @@ -67,6 +67,13 @@ jobs:
env:
LOG_LEVEL: ${{ runner.debug == 1 && 'DEBUG' || 'INFO'}}

- name: Remove non-modules for artifact
if: github.event_name == 'pull_request'
run: |
rm -r release/$VERSION/generated
rm release/$VERSION/lib_*
rm release/$VERSION/meta.json

- name: Upload artifact
if: github.event_name == 'pull_request'
uses: actions/upload-artifact@v4
Expand All @@ -92,7 +99,7 @@ jobs:
branch: release

test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4

Expand Down Expand Up @@ -126,7 +133,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '17'
java-version: '21'

- name: Download server files
run: |
Expand All @@ -138,6 +145,9 @@ jobs:
- name: Copy packs to world
run: |
mkdir -p world/datapacks
rm out/gm4_guidebook.zip
rm out/gm4_zauber_cauldrons.zip
rm out/gm4_zauber_liquids.zip
cp out/gm4_*.zip world/datapacks

- name: Run test server
Expand Down
4 changes: 2 additions & 2 deletions base/assets/gm4/font/container_gui.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
{
"type": "space",
"advances": {
"\uf824": 3,
"\uf808": -10
"\uf824": 5,
"\uf808": -8
}
}
]
Expand Down
14 changes: 2 additions & 12 deletions base/assets/gm4/font/default.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
{
"providers": [
{
"type": "space",
"advances": {
" ": 4,
"\u200c": 0
}
},
{
"type": "ttf",
"file": "gm4:minecraft.ttf",
"shift": [0,-0.5],
"size": 13,
"oversample": 7
"type": "reference",
"id": "minecraft:default"
}
]
}
Loading
Loading