Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
tier940 committed Sep 22, 2023
2 parents fe4236d + 9020d5a commit c78d7f4
Show file tree
Hide file tree
Showing 25 changed files with 333 additions and 335 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Get the version
run: |
Expand All @@ -30,10 +30,10 @@ jobs:
unzip main.zip
mv -vf ./gregtech-expert-2-questbook-main/* ./overrides/config/ftbquests/
rm -rf ./gregtech-expert-2-questbook-main/ ./main.zip
- name: Archive Release CF
run: |
zip -r ./GTExpert2-${{ env.VERSION }}-pr-${{ env.PR_VERSION }}-cf.zip ./manifest.json ./modlist.html ./overrides/bansoukou/ ./overrides/config/ ./overrides/local/ ./overrides/resources/ ./overrides/scripts/
zip -r ./GTExpert2-${{ env.VERSION }}-pr-${{ env.PR_VERSION }}-cf.zip ./manifest.json ./modlist.html ./overrides/bansoukou/ ./overrides/config/ ./overrides/local/ ./overrides/resourcepacks/icons/ ./overrides/resources/ ./overrides/scripts/
- name: Setup Python
uses: actions/setup-python@v4
Expand Down
71 changes: 42 additions & 29 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,43 @@
name: Deploy modpack

permissions:
contents: write
deployments: write

on:
push:
tags:
- 'v*-release'
- 'v*-beta'
- 'v*-alpha'
workflow_dispatch:
inputs:
version:
description: 'Modpack version'
required: true
release_type:
description: 'Release type'
type: choice
default: 'release'
options:
- 'release'
- 'beta'
- 'alpha'

env:
# Version of the mod
FULL_VERSION: "v${{ github.event.inputs.version }}-${{ github.event.inputs.release_type }}"
# type of release
NAME: "GTExpert2"

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Get the version
run: |
echo VERSION=$(echo ${GITHUB_REF} | sed -e 's#refs/tags/##g' | awk -F'-' '{print $1}') >> $GITHUB_ENV
echo LEVEL=$(echo ${GITHUB_REF} | sed -e 's#refs/tags/##g' | awk -F'-' '{print $2}') >> $GITHUB_ENV
uses: actions/checkout@v4

- name: Set the version
run: |
MODPACKVERSION=${{ env.VERSION }}
echo "GregTech Expert 2 ${MODPACKVERSION}-${{ env.LEVEL }}" > ./overrides/resources/custommainmenu/version.txt
sed -i -e "s/MODPACKVERSION/${MODPACKVERSION}/g" ./manifest.json
sed -i -e "s/MODPACKVERSION/${MODPACKVERSION}/g" ./instance.cfg
sed -i -e "s/MODPACKVERSION/${MODPACKVERSION}/g" ./overrides/config/craftpresence.json
echo "GregTech Expert 2 ${{ env.FULL_VERSION }}" > ./overrides/resources/custommainmenu/version.txt
sed -i -e "s/MODPACKVERSION/v${{ github.event.inputs.version }}/g" ./manifest.json
sed -i -e "s/MODPACKVERSION/v${{ github.event.inputs.version }}/g" ./instance.cfg
sed -i -e "s/MODPACKVERSION/v${{ github.event.inputs.version }}/g" ./overrides/config/craftpresence.json
- name: Download quest zip
run: |
Expand All @@ -35,7 +48,7 @@ jobs:
- name: Archive Release CF
run: |
zip -r ./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-cf.zip ./manifest.json ./modlist.html ./manifest.json ./modlist.html ./overrides/bansoukou/ ./overrides/config/ ./overrides/local/ ./overrides/resources/ ./overrides/scripts/
zip -r ./${{ env.NAME }}-${{ env.FULL_VERSION }}-cf.zip ./manifest.json ./modlist.html ./manifest.json ./modlist.html ./overrides/bansoukou/ ./overrides/config/ ./overrides/local/ ./overrides/resourcepacks/icons/ ./overrides/resources/ ./overrides/scripts/
- name: Setup Python
uses: actions/setup-python@v4
Expand All @@ -59,7 +72,7 @@ jobs:
cp -vf ./icon.png .minecraft/
rm -rf .minecraft/mods/.gitkeep
rm -rf .minecraft/resourcepacks/.gitkeep
zip -r ./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-mmc.zip ./mmc-pack.json ./instance.cfg .minecraft/
zip -r ./${{ env.NAME }}-${{ env.FULL_VERSION }}-mmc.zip ./mmc-pack.json ./instance.cfg .minecraft/
- name: Move Server Files
run: |
Expand All @@ -68,7 +81,7 @@ jobs:
- name: Archive Release Server
run: |
mv -vf .minecraft/* ./
zip -r ./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-server.zip ./docker-compose.yml ./PleaseRead.txt ./log4j2_112-116.xml ./Install.bat ./Install.sh ./ServerStart.bat ./ServerStart.sh ./settings.bat ./settings.sh ./TmuxServer.sh ./bansoukou/ ./config/ ./local/ ./mods/ ./resources/ ./scripts/
zip -r ./${{ env.NAME }}-${{ env.FULL_VERSION }}-server.zip ./docker-compose.yml ./PleaseRead.txt ./log4j2_112-116.xml ./Install.bat ./Install.sh ./ServerStart.bat ./ServerStart.sh ./settings.bat ./settings.sh ./TmuxServer.sh ./bansoukou/ ./config/ ./local/ ./mods/ ./resources/ ./scripts/
- name: Create GitHub Release
uses: softprops/action-gh-release@v1
Expand All @@ -77,20 +90,20 @@ jobs:
prerelease: false
generate_release_notes: true
files: |
./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-cf.zip
./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-mmc.zip
./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-server.zip
./${{ env.NAME }}-${{ env.FULL_VERSION }}-cf.zip
./${{ env.NAME }}-${{ env.FULL_VERSION }}-mmc.zip
./${{ env.NAME }}-${{ env.FULL_VERSION }}-server.zip
- name: Upload Curseforge
uses: ./.github/actions/curseforge-modpack-upload
uses: henkelmax/upload-curseforge-modpack-[email protected]
with:
api-token: ${{ secrets.CF_API_TOKEN }}
project-id: '565238'
modpack-path: ./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-cf.zip
modpack-server-path: ./GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-server.zip
modpack-path: ./${{ env.NAME }}-${{ env.FULL_VERSION }}-cf.zip
modpack-server-path: ./${{ env.NAME }}-${{ env.FULL_VERSION }}-server.zip
changelog: 'Check the changes here. [Github - CHANGELOG.md](https://github.com/GTModpackTeam/gregtech-expert-2/blob/main/CHANGELOG_v2.md "")'
changelog-format: markdown
game-version: '628' # 628 or 6756 (Accepted at either)
display-name: GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}
server-display-name: GTExpert2-${{ env.VERSION }}-${{ env.LEVEL }}-server
release-type: ${{ env.LEVEL }}
game-version: '1.12.2'
display-name: ${{ env.NAME }}-${{ env.FULL_VERSION }}
server-display-name: ${{ env.NAME }}-${{ env.FULL_VERSION }}-server
release-type: ${{ github.event.inputs.release_type }}
31 changes: 31 additions & 0 deletions CHANGELOG_v2.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,34 @@
# v2.5.5
## Modpack information
- All blocks of Chisel are now supported by Auto Chisel.
- Thanks to @MrKono for his support!!

## Update mods
- CraftPresence
- ModularUI
- Inventory Bogo Sorter
- CraftTweaker
- Zen Utils
- GTExpert2 Core Mod
- BisectHosting Server Integration Menu
- LoliASM
- MixinBooter

## Add mod
- RenderLib
- Nothirium
- Entity Culling

## Remove mods
- Spark Unforged

## Move mods
- The One Probe -> The One Probe Community Edition
- Phosphor -> 燐/Hesperus
- Phosphor Crash Fix -> 燐/Hesperus

* * *

# v2.5.4
# Update mods
- AE2 Unofficial Extended Life
Expand Down
44 changes: 27 additions & 17 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
},
{
"projectID": 624243,
"fileID": 4635658,
"fileID": 4692436,
"required": true
},
{
"projectID": 632327,
"fileID": 4692161,
"fileID": 4761867,
"required": true
},
{
Expand Down Expand Up @@ -131,12 +131,12 @@
},
{
"projectID": 585546,
"fileID": 4628846,
"fileID": 4743092,
"required": true
},
{
"projectID": 245211,
"fileID": 2667280,
"projectID": 885670,
"fileID": 4746213,
"required": true
},
{
Expand All @@ -151,7 +151,7 @@
},
{
"projectID": 401178,
"fileID": 4674014,
"fileID": 4746454,
"required": true
},
{
Expand All @@ -171,7 +171,7 @@
},
{
"projectID": 297038,
"fileID": 4682465,
"fileID": 4752213,
"required": true
},
{
Expand Down Expand Up @@ -236,7 +236,7 @@
},
{
"projectID": 239197,
"fileID": 4707234,
"fileID": 4731280,
"required": true
},
{
Expand Down Expand Up @@ -391,7 +391,7 @@
},
{
"projectID": 419286,
"fileID": 4699275,
"fileID": 4752579,
"required": true
},
{
Expand Down Expand Up @@ -506,7 +506,7 @@
},
{
"projectID": 871198,
"fileID": 4714078,
"fileID": 4753319,
"required": true
},
{
Expand All @@ -520,8 +520,8 @@
"required": true
},
{
"projectID": 900927,
"fileID": 4708794,
"projectID": 460609,
"fileID": 4623985,
"required": true
},
{
Expand Down Expand Up @@ -596,7 +596,7 @@
},
{
"projectID": 851103,
"fileID": 4742717,
"fileID": 4752230,
"required": true
},
{
Expand Down Expand Up @@ -640,13 +640,23 @@
"required": true
},
{
"projectID": 318255,
"fileID": 2919497,
"projectID": 624967,
"fileID": 4710694,
"required": true
},
{
"projectID": 739808,
"fileID": 4183001,
"projectID": 409087,
"fileID": 4620881,
"required": true
},
{
"projectID": 624960,
"fileID": 4710696,
"required": true
},
{
"projectID": 620262,
"fileID": 4724647,
"required": true
}
],
Expand Down
10 changes: 6 additions & 4 deletions modlist.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<li><a href="https://www.curseforge.com/minecraft/mc-mods/fps-reducer">FPS Reducer (by bre2el)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/p455w0rds-library">p455w0rd's Library (by TheRealp455w0rd)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/bisecthosting-server-integration-menu-forge">BisectHosting Server Integration Menu [FORGE] (by BisectHosting)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/the-one-probe">The One Probe (by McJty)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/the-one-probe-community-edition">The One Probe Community Edition (by xuanyu)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/realbench">RealBench (by Prototik)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-ultimine-forge">FTB Ultimine (Forge) (by FTB)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/zenutil">Zen Utils (by youyihj)</a></li>
Expand Down Expand Up @@ -100,7 +100,7 @@
<li><a href="https://www.curseforge.com/minecraft/mc-mods/vintagefix">VintageFix (by embeddedt)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/enhancedp2p">EnhancedP2P (by blacy1551)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/dans-mouse-tweaks">dan's Mouse Tweaks (by cleanroommc)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/spark-unforged">Spark Unforged (by fonnymunkey)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/lolasm">CensoredASM (by Rongmario)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/ae2-fluid-crafting-rework">AE2 Fluid Crafting Rework (by jojo2k333)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/xtones">Xtones (by TehNut)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/universal-tweaks">Universal Tweaks (by ACGaming56)</a></li>
Expand All @@ -123,6 +123,8 @@
<li><a href="https://www.curseforge.com/minecraft/mc-mods/untranslateditemsaddon-alsofluids"></a>UntranslatedItems: AlsoFluids (by katatsumuri_pan)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/ezstorage-2-patch">EZStorage 2 Patch (by sjcl)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/p455w0rds-ae2-wireless-terminals-patch">p455w0rd's AE2 Wireless Terminals Patch (by katatsumuri_pan)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/phosphor-forge">Phosphor (Forge) (by jellysquid3_)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/phosphorcrashfix">Phosphor Crash Fix (by Elephant_1214)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/renderlib">RenderLib (by meldexun)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/entity-culling">Entity Culling (by meldexun)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/nothirium">Nothirium (by meldexun)</a></li>
<li><a href="https://www.curseforge.com/minecraft/mc-mods/hesperus">燐/Hesperus (by kappa_maintainer)</a></li>
</ul>
18 changes: 0 additions & 18 deletions overrides/config/AppliedEnergistics2/AppliedEnergistics2.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -63,26 +63,16 @@ blockingmode {
gregtech:shape.extruder.wire
gregtech:shape.extruder.pipe.tiny
gregtech:shape.extruder.pipe.small
gregtech:shape.extruder.pipe.medium
gregtech:shape.extruder.pipe.normal
gregtech:shape.extruder.pipe.large
gregtech:shape.extruder.pipe.huge
gregtech:shape.extruder.block
gregtech:shape.extruder.sword
gregtech:shape.extruder.pickaxe
gregtech:shape.extruder.shovel
gregtech:shape.extruder.axe
gregtech:shape.extruder.hoe
gregtech:shape.extruder.hammer
gregtech:shape.extruder.file
gregtech:shape.extruder.saw
gregtech:shape.extruder.gear
gregtech:shape.extruder.bottle
gregtech:shape.extruder.foil
gregtech:shape.extruder.gear_small
gregtech:shape.extruder.rod_long
gregtech:shape.extruder.rotor
gregtech:glass_lens.white
gregtech:glass_lens.orange
gregtech:glass_lens.magenta
gregtech:glass_lens.light_blue
Expand Down Expand Up @@ -123,14 +113,6 @@ blockingmode {
ore:lensVinteum
ore:lensNetherQuartz
ore:lensNetherStar
gregtechfoodoption:wooden_form.bun
gregtechfoodoption:wooden_form.bread
gregtechfoodoption:wooden_form.baguette
gregtechfoodoption:config.slicer_blade.flat
gregtechfoodoption:config.slicer_blade.stripes
gregtechfoodoption:config.slicer_blade.octagonal
gregtechfoodoption:component.cheddar_curd_mold
gregtechfoodoption:component.aged_cheddar_mold
>
}

Expand Down
2 changes: 1 addition & 1 deletion overrides/config/UniversalTweaks.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ general {

attributes {
# Sets custom ranges for entity attributes
B:"[01] Attributes Toggle"=true
B:"[01] Attributes Toggle"=false
D:"[02] Max Health Min"=-65536.0
D:"[03] Max Health Max"=65536.0
D:"[04] Follow Range Min"=-65536.0
Expand Down
Loading

0 comments on commit c78d7f4

Please sign in to comment.