Merge branch 'main' into 0.7.0
This commit is contained in:
commit
0e4abc7355
4 changed files with 9 additions and 9 deletions
|
|
@ -9,7 +9,7 @@ enable-command-block=false
|
|||
enable-jmx-monitoring=false
|
||||
enable-query=false
|
||||
enable-rcon=false
|
||||
enable-status=false
|
||||
enable-status=true
|
||||
enforce-secure-profile=true
|
||||
enforce-whitelist=false
|
||||
entity-broadcast-range-percentage=100
|
||||
|
|
|
|||
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
|
|
@ -165,7 +165,7 @@ jobs:
|
|||
mkdir -p .minecraft
|
||||
mv -vf {config,defaultconfigs,kubejs,mods,.github/buildtools/serverpack/*} .minecraft
|
||||
cat .github/buildtools/client_mod.txt | while read -r line; do find .minecraft/mods -name "$line" -delete; done
|
||||
zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip ./
|
||||
zip -r ${{ needs.modpack-info.outputs.project_name }}-${{ needs.modpack-info.outputs.project_version }}-server.zip .minecraft/*
|
||||
|
||||
- name: Upload zip
|
||||
uses: actions/upload-artifact@v4.0.0
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{"clothes_hat":{"x":0,"y":20,"enabled":false,"halign":"LEFT","valign":"TOP"},"hands":{"x":0,"y":40,"enabled":false,"halign":"LEFT","valign":"TOP"},"belt":{"x":0,"y":80,"enabled":false,"halign":"LEFT","valign":"TOP"},"ring":{"x":0,"y":100,"enabled":false,"halign":"LEFT","valign":"TOP"},"back":{"x":0,"y":120,"enabled":false,"halign":"LEFT","valign":"TOP"},"bracelet":{"x":0,"y":140,"enabled":false,"halign":"LEFT","valign":"TOP"},"necklace":{"x":0,"y":160,"enabled":false,"halign":"LEFT","valign":"TOP"},"body":{"x":0,"y":180,"enabled":false,"halign":"LEFT","valign":"TOP"},"clothes_torso":{"x":0,"y":180,"enabled":false,"halign":"LEFT","valign":"TOP"},"curio":{"x":0,"y":200,"enabled":false,"halign":"LEFT","valign":"TOP"},"head":{"x":0,"y":20,"enabled":false,"halign":"LEFT","valign":"TOP"},"charm":{"x":0,"y":60,"enabled":false,"halign":"LEFT","valign":"TOP"},"clothes_pants":{"x":0,"y":260,"enabled":false,"halign":"LEFT","valign":"TOP"},"clothes_socks":{"x":0,"y":280,"enabled":false,"halign":"LEFT","valign":"TOP"}}
|
||||
{"clothes_hat":{"x":20,"y":98,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"hands":{"x":2,"y":80,"enabled":true,"halign":"LEFT","valign":"TOP"},"belt":{"x":2,"y":62,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"ring":{"x":2,"y":117,"enabled":true,"halign":"LEFT","valign":"TOP"},"back":{"x":2,"y":80,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"bracelet":{"x":2,"y":-3,"enabled":true,"halign":"LEFT","valign":"CENTER"},"necklace":{"x":2,"y":146,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"body":{"x":2,"y":126,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"clothes_torso":{"x":20,"y":80,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"curio":{"x":2,"y":136,"enabled":true,"halign":"LEFT","valign":"TOP"},"head":{"x":2,"y":98,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"charm":{"x":2,"y":99,"enabled":true,"halign":"LEFT","valign":"TOP"},"clothes_pants":{"x":20,"y":62,"enabled":true,"halign":"LEFT","valign":"BOTTOM"},"clothes_socks":{"x":20,"y":44,"enabled":true,"halign":"LEFT","valign":"BOTTOM"}}
|
||||
|
|
@ -7,15 +7,15 @@
|
|||
invVert = false
|
||||
#Inventory HUD alpha
|
||||
#Range: 0 ~ 100
|
||||
invAlpha = 0
|
||||
invAlpha = 50
|
||||
#Toggle on by default
|
||||
byDefault = false
|
||||
#Animate recently picked up items
|
||||
animatedInv = false
|
||||
animatedInv = true
|
||||
#Hide background if inventory is empty
|
||||
hideBackground = false
|
||||
hideBackground = true
|
||||
#Show Inventory HUD when debug menu is open
|
||||
invWithDebug = true
|
||||
invWithDebug = false
|
||||
|
||||
#Settings for ArmorStatus HUD
|
||||
[armorhud]
|
||||
|
|
@ -113,10 +113,10 @@
|
|||
potHalign = "LEFT"
|
||||
#Potion HUD position (X)
|
||||
#Range: -9999 ~ 9999
|
||||
xPotionPos = 20
|
||||
xPotionPos = 3
|
||||
#Potion HUD position (Y)
|
||||
#Range: -9999 ~ 9999
|
||||
yPotionPos = 20
|
||||
yPotionPos = 3
|
||||
#Helmet position (X)
|
||||
#Range: -9999 ~ 9999
|
||||
helmPosX = 103
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue