Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
NielsPilgaard committed Apr 18, 2020
2 parents a527075 + 069a99a commit 1c88ecf
Show file tree
Hide file tree
Showing 139 changed files with 4,247 additions and 2,475 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,9 @@ config/craftingtweaks-client.toml
new.json
old.json
reauth.toml
soundsMuffled.dat
MakeModpackFiles.bat
MakeModpackFilesPostToDiscord.bat
PostToDiscord.bat
patchouli_data.json
patchouli_data.json
60 changes: 60 additions & 0 deletions MakeModpackFiles.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
. "$PSScriptRoot\settings.ps1"
. "$PSScriptRoot\secrets.ps1"
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12

function Clear-SleepHost {
Start-Sleep 2
Clear-Host
}

if (-not (test-path "$env:ProgramFiles\7-Zip\7z.exe")) { throw "$env:ProgramFiles\7-Zip\7z.exe needed to use the ModpackUploader." }
Set-Alias sz "$env:ProgramFiles\7-Zip\7z.exe"

$TwitchExportBuilder = "TwitchExportBuilder.exe"
if (!(Test-Path $TwitchExportBuilder) -or $ENABLE_ALWAYS_UPDATE_JARS) {
Remove-Item $TwitchExportBuilder -Recurse -Force -ErrorAction SilentlyContinue
Download-GithubRelease -repo "Gaz492/twitch-export-builder" -file "twitch-export-builder_windows_amd64.exe"
Rename-Item -Path "twitch-export-builder_windows_amd64.exe" -NewName $TwitchExportBuilder -ErrorAction SilentlyContinue
}
.\TwitchExportBuilder.exe -n "$CLIENT_FILENAME" -p "$MODPACK_VERSION"

Write-Host ""
Write-Host "######################################" -ForegroundColor Cyan
Write-Host ""
Write-Host "Compressing Server files..." -ForegroundColor Green
Write-Host ""
Write-Host "######################################" -ForegroundColor Cyan
Write-Host ""

$CONTENTS_TO_MOVE | ForEach-Object {
$FilePath = "$PSScriptRoot/development/include-in-server-files/$_"
Copy-Item -Path $FilePath -Destination $PSScriptRoot
}

$SERVER_FILENAME = "$SERVER_FILENAME.zip"
sz a -tzip $SERVER_FILENAME $CONTENTS_TO_ZIP

$CONTENTS_TO_MOVE | ForEach-Object {
$FilePath = "$PSScriptRoot/$_"
Remove-Item -Path $FilePath -Force
}

Write-Host "Removing Client Mods from Server Files" -ForegroundColor Cyan
foreach ($clientMod in $CLIENT_MODS) {
Write-Host "Removing Client Mod $clientMod"
sz d $SERVER_FILENAME "mods/$clientMod*" | Out-Null
}


Write-Host "######################################" -ForegroundColor Cyan
Write-Host ""
Write-Host "The Modpack Uploader has completed." -ForegroundColor Green
Write-Host ""
Write-Host "######################################" -ForegroundColor Cyan

# $CurlUrl = "https://discordapp.com/api/webhooks/$WEBHOOK_ID/$WEBHOOK_TOKEN"
# $FilePath = "$CLIENT_FILENAME-$MODPACK_VERSION.zip"

# curl.exe --url $CurlUrl -F ContentType="multipart/form-data" -F content=@$FilePath --progress-bar

# Start-Sleep -Seconds 10
59 changes: 59 additions & 0 deletions MakeModpackFilesPostToDiscord.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
. "$PSScriptRoot\settings.ps1"
. "$PSScriptRoot\secrets.ps1"
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12

function Clear-SleepHost {
Start-Sleep 2
Clear-Host
}

if (-not (test-path "$env:ProgramFiles\7-Zip\7z.exe")) { throw "$env:ProgramFiles\7-Zip\7z.exe needed to use the ModpackUploader." }
Set-Alias sz "$env:ProgramFiles\7-Zip\7z.exe"

$TwitchExportBuilder = "TwitchExportBuilder.exe"
if (!(Test-Path $TwitchExportBuilder) -or $ENABLE_ALWAYS_UPDATE_JARS) {
Remove-Item $TwitchExportBuilder -Recurse -Force -ErrorAction SilentlyContinue
Download-GithubRelease -repo "Gaz492/twitch-export-builder" -file "twitch-export-builder_windows_amd64.exe"
Rename-Item -Path "twitch-export-builder_windows_amd64.exe" -NewName $TwitchExportBuilder -ErrorAction SilentlyContinue
}
.\TwitchExportBuilder.exe -n "$CLIENT_FILENAME" -p "$MODPACK_VERSION"

Write-Host ""
Write-Host "######################################" -ForegroundColor Cyan
Write-Host ""
Write-Host "Compressing Server files..." -ForegroundColor Green
Write-Host ""
Write-Host "######################################" -ForegroundColor Cyan
Write-Host ""

$CONTENTS_TO_MOVE | ForEach-Object {
$FilePath = "$PSScriptRoot/development/include-in-server-files/$_"
Copy-Item -Path $FilePath -Destination $PSScriptRoot
}

$SERVER_FILENAME = "$SERVER_FILENAME.zip"
sz a -tzip $SERVER_FILENAME $CONTENTS_TO_ZIP

$CONTENTS_TO_MOVE | ForEach-Object {
$FilePath = "$PSScriptRoot/$_"
Remove-Item -Path $FilePath -Force
}

Write-Host "Removing Client Mods from Server Files" -ForegroundColor Cyan
foreach ($clientMod in $CLIENT_MODS) {
Write-Host "Removing Client Mod $clientMod"
sz d $SERVER_FILENAME "mods/$clientMod*" | Out-Null
}


Write-Host "######################################" -ForegroundColor Cyan
Write-Host ""
Write-Host "The Modpack Uploader has completed." -ForegroundColor Green
Write-Host ""
Write-Host "######################################" -ForegroundColor Cyan


$CurlUrl = "https://discordapp.com/api/webhooks/$WEBHOOK_ID/$WEBHOOK_TOKEN"
$FilePath = "$CLIENT_FILENAME-$MODPACK_VERSION.zip"

curl.exe --url $CurlUrl -F ContentType="multipart/form-data" -F content=@$FilePath --progress-bar
1 change: 1 addition & 0 deletions post-file-to-discord.ps1 → PostToDiscord.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ $CurlUrl = "https://discordapp.com/api/webhooks/$WEBHOOK_ID/$WEBHOOK_TOKEN"
$FilePath = "$CLIENT_FILENAME-$MODPACK_VERSION.zip"

curl.exe --url $CurlUrl -F ContentType="multipart/form-data" -F content=@$FilePath --progress-bar
pause
86 changes: 85 additions & 1 deletion changelogs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,68 @@
## Enigmatica 4 v0.5.3

#### Make sure to backup your world before updating!

There is a chance that this new update does not work with your current world. At the very least blocks from Create will be removed when updating from 0.4.x or prior.

*Forge-1.14.4-28.2.3*



*[Mod Updates](https://github.com/NillerMedDild/Enigmatica4/blob/master/changelogs/CHANGELOG_MODS_0.5.3.txt)*



**Added Mods**

-

**Removed Mods**

*

**Changes**

*

**Fixed bugs**

-

## Enigmatica 4 v0.5.2

#### Make sure to backup your world before updating!

There is a chance that this new update does not work with your current world. At the very least blocks from Create will be removed when updating from 0.4.x or prior.

*Forge-1.14.4-28.2.3*
*[Mod List](https://github.com/NillerMedDild/Enigmatica4/blob/master/changelogs/CHANGELOG_MODS_0.5.2.txt)*

**Added Mods**

- StepUp \(Off by default\) [\#361](https://github.com/NillerMedDild/Enigmatica4/issues/361)
- Stone Catalysts [\#359](https://github.com/NillerMedDild/Enigmatica4/issues/359)

**Removed Mods**

* Inventory Tweaks: Reborn (It was removed from CurseForge, had to remove it from the pack)

**Changes**

* Fixes some Blast Furnace recipes taking the same time as their Furnace equivalents
* Nerf Ore Excavation - Apply higher hunger toll [\#366](https://github.com/NillerMedDild/Enigmatica4/issues/366)
* "Unlocked" OreExcavation - It can be used on all blocks [\#363](https://github.com/NillerMedDild/Enigmatica4/issues/363)
* Tetra Tier4/5 without worldgen [\#343](https://github.com/NillerMedDild/Enigmatica4/issues/343)

**Fixed bugs**

- Copper Ore from Create spawning [\#354](https://github.com/NillerMedDild/Enigmatica4/issues/354)
- Broken Linux Launch Script [\#336](https://github.com/NillerMedDild/Enigmatica4/issues/336)
- Minecolonies mod issue [\#325](https://github.com/NillerMedDild/Enigmatica4/issues/325)

## Enigmatica 4 v0.5.1

#### Make sure to backup your world before updating!

There is a chance that this new update does not work with your current world. At the very least blocks from Create will be removed when updating from 0.4.x or prior.

*Forge-1.14.4-28.2.3*
Expand All @@ -24,9 +86,11 @@ There is a chance that this new update does not work with your current world. At
- Just Enough Resources \(JER\) not working [\#293](https://github.com/NillerMedDild/Enigmatica4/issues/293)
- Tool Tip issue RFTools Storage [\#177](https://github.com/NillerMedDild/Enigmatica4/issues/177)
- RFTools GUI crash [\#176](https://github.com/NillerMedDild/Enigmatica4/issues/176)

## Enigmatica 4 v0.5.0

### This is a major update, make sure to backup your world before updating!

There is a chance that this new update does not work with your current world. At the very least blocks from Create will be removed when updating from 0.4.x or prior.

*Forge-1.14.4-28.2.3*
Expand Down Expand Up @@ -110,6 +174,7 @@ There is a chance that this new update does not work with your current world. At
**Failed, servers could not start**

## Enigmatica 4 v0.4.5

*Forge-1.14.4-28.2.0*
*[Mod Updates](https://github.com/NillerMedDild/Enigmatica4/blob/master/CHANGELOG-MODS.md)*

Expand All @@ -130,6 +195,7 @@ There is a chance that this new update does not work with your current world. At
- Recipe confict: Amethyst swords [\#270](https://github.com/NillerMedDild/Enigmatica4/issues/270) [[Script](https://github.com/NillerMedDild/Enigmatica4/labels/Script)]

## Enigmatica 4 v0.4.4

*Forge-1.14.4-28.1.109*
*[Mod Updates](https://github.com/NillerMedDild/Enigmatica4/blob/master/CHANGELOG-MODS.md)*

Expand All @@ -147,6 +213,7 @@ There is a chance that this new update does not work with your current world. At
- Bonsai Tree 2 not working on Server [\#261](https://github.com/NillerMedDild/Enigmatica4/issues/261)

## Enigmatica 4 v0.4.3

*Forge-1.14.4-28.1.109*
*[Mod Updates](https://github.com/NillerMedDild/Enigmatica4/blob/master/CHANGELOG-MODS.md)*

Expand All @@ -164,6 +231,7 @@ There is a chance that this new update does not work with your current world. At
- Crafting Station crashing while not having adjacent chests/furnaces (tile entities) etc.

## [Enigmatica 4 v0.4.2](https://github.com/NillerMedDild/Enigmatica4/tree/0.4.2)

*Forge-1.14.4-28.1.109*
*[Mod Updates](https://github.com/NillerMedDild/Enigmatica4/blob/master/CHANGELOG-MODS.md)*

Expand Down Expand Up @@ -199,6 +267,7 @@ There is a chance that this new update does not work with your current world. At
- Everlasting Abilities Flight non-functional, because of Angel Ring issue [\#242](https://github.com/NillerMedDild/Enigmatica4/issues/242)

## [Enigmatica 4 v0.4.1](https://github.com/NillerMedDild/Enigmatica4/tree/0.4.1)

*Forge-1.14.4-28.1.109*

**Changes**
Expand All @@ -217,6 +286,7 @@ There is a chance that this new update does not work with your current world. At
- Items with NBT act badly inside the vanilla crafting table [\#169](https://github.com/NillerMedDild/Enigmatica4/issues/169)

## [Enigmatica 4 v0.4.0](https://github.com/NillerMedDild/Enigmatica4/tree/0.4.0)

*Forge-1.14.4-28.1.109*

**Changes**
Expand All @@ -225,6 +295,7 @@ There is a chance that this new update does not work with your current world. At
- Add Toolkit [\#216](https://github.com/NillerMedDild/Enigmatica4/issues/216) [[Mod](https://github.com/NillerMedDild/Enigmatica4/labels/Mod)]

## [Enigmatica 4 v0.3.7](https://github.com/NillerMedDild/Enigmatica4/tree/0.3.7)

*Forge-1.14.4-28.1.109*

**Changes**
Expand All @@ -239,6 +310,7 @@ There is a chance that this new update does not work with your current world. At
- Watering Can doesn't water while looking at crops. [\#181](https://github.com/NillerMedDild/Enigmatica4/issues/181)

## [Enigmatica 4 v0.3.6](https://github.com/NillerMedDild/Enigmatica4/tree/0.3.6)

*Forge-1.14.4-28.1.103*

**Changes**
Expand All @@ -253,6 +325,7 @@ There is a chance that this new update does not work with your current world. At
- Fluidtanks issues [\#208](https://github.com/NillerMedDild/Enigmatica4/issues/208)

## [Enigmatica 4 v0.3.5](https://github.com/NillerMedDild/Enigmatica4/tree/0.3.5)

*Forge-1.14.4-28.1.103*

**Changes**
Expand Down Expand Up @@ -291,13 +364,15 @@ There is a chance that this new update does not work with your current world. At
- Crash KubeJS [\#190](https://github.com/NillerMedDild/Enigmatica4/issues/190)

## [Enigmatica 4 v0.3.4](https://github.com/NillerMedDild/Enigmatica4/tree/0.3.4)

*Forge-1.14.4-28.1.103*

**Fixed bugs**

- Servers being unable to start. Had to remove EntitySpring to resolve the issue.

## [Enigmatica 4 v0.3.3](https://github.com/NillerMedDild/Enigmatica4/tree/0.3.3)

*Forge-1.14.4-28.1.103*

**Changes**
Expand All @@ -313,6 +388,7 @@ There is a chance that this new update does not work with your current world. At
- Ender Biotite from Quark can't be veinmined [\#187](https://github.com/NillerMedDild/Enigmatica4/issues/187) [[Script](https://github.com/NillerMedDild/Enigmatica4/labels/Script)]

## [Enigmatica 4 v0.3.2](https://github.com/NillerMedDild/Enigmatica4/tree/0.3.2)

*Forge-1.14.4-28.1.103*

**Changes**
Expand Down Expand Up @@ -409,6 +485,7 @@ There is a chance that this new update does not work with your current world. At
- Swing through grass not working on servers (I removed it from the server files, d'oh)

## [Enigmatica 4 v0.2.1](https://github.com/NillerMedDild/Enigmatica4/tree/0.2.1)

*Forge-1.14.4-28.1.74*

**Changes**
Expand All @@ -421,9 +498,11 @@ There is a chance that this new update does not work with your current world. At
- Server crash caused by mobrenderer

## [Enigmatica 4 v0.2.0](https://github.com/NillerMedDild/Enigmatica4/tree/0.2.0)

*Forge-1.14.4-28.1.69*

**Changes**

- Add Corail Tombstone [\#92](https://github.com/NillerMedDild/Enigmatica4/issues/92) [[Mod](https://github.com/NillerMedDild/Enigmatica4/labels/Mod)]
- Add Common Capabilities [\#98](https://github.com/NillerMedDild/Enigmatica4/issues/98) [[Mod](https://github.com/NillerMedDild/Enigmatica4/labels/Mod)]
- Add Flopper [\#97](https://github.com/NillerMedDild/Enigmatica4/issues/97) [[Mod](https://github.com/NillerMedDild/Enigmatica4/labels/Mod)]
Expand All @@ -436,13 +515,15 @@ There is a chance that this new update does not work with your current world. At
- Game Crash - Squid & Armor issues [\#93](https://github.com/NillerMedDild/Enigmatica4/issues/93)

## [Enigmatica 4 v0.1.9](https://github.com/NillerMedDild/Enigmatica4/tree/0.1.9)

*Forge-1.14.4-28.1.69*

**Fixed bugs**

- Server files no longer have client mods in them.

## Enigmatica 4 v0.1.8

*Forge-1.14.4-28.1.69*

**Implemented enhancements**
Expand Down Expand Up @@ -531,8 +612,11 @@ There is a chance that this new update does not work with your current world. At
- Server files are missing all top-level server-only files [\#29](https://github.com/NillerMedDild/Enigmatica4/issues/29)

## [0.1.4](https://github.com/NillerMedDild/Enigmatica4/tree/0.1.4)

## [0.1.3](https://github.com/NillerMedDild/Enigmatica4/tree/0.1.3)

## [0.1.2](https://github.com/NillerMedDild/Enigmatica4/tree/0.1.2)

## [0.1.1](https://github.com/NillerMedDild/Enigmatica4/tree/0.1.1)

**Implemented enhancements**
Expand All @@ -549,4 +633,4 @@ There is a chance that this new update does not work with your current world. At
- \[Request\] Add Glassential and Turf [\#11](https://github.com/NillerMedDild/Enigmatica4/issues/11) [[Config](https://github.com/NillerMedDild/Enigmatica4/labels/Config)] [[Mod](https://github.com/NillerMedDild/Enigmatica4/labels/Mod)]
- Add Cycle Paintings [\#9](https://github.com/NillerMedDild/Enigmatica4/issues/9) [[Config](https://github.com/NillerMedDild/Enigmatica4/labels/Config)] [[Mod](https://github.com/NillerMedDild/Enigmatica4/labels/Mod)]
- Add Conduit Prevents Drowned [\#8](https://github.com/NillerMedDild/Enigmatica4/issues/8) [[Config](https://github.com/NillerMedDild/Enigmatica4/labels/Config)] [[Mod](https://github.com/NillerMedDild/Enigmatica4/labels/Mod)]
- Add Villager Names [\#7](https://github.com/NillerMedDild/Enigmatica4/issues/7) [[Config](https://github.com/NillerMedDild/Enigmatica4/labels/Config)] [[Mod](https://github.com/NillerMedDild/Enigmatica4/labels/Mod)]
- Add Villager Names [\#7](https://github.com/NillerMedDild/Enigmatica4/issues/7) [[Config](https://github.com/NillerMedDild/Enigmatica4/labels/Config)] [[Mod](https://github.com/NillerMedDild/Enigmatica4/labels/Mod)]
6 changes: 6 additions & 0 deletions config/apotheosis/deadly.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,15 @@ general {
# [range: 0 ~ 50, default: 1]
I:"rats:plague_cloud"=1

# [range: 0 ~ 50, default: 1]
I:"rats:rat_spawner"=1

# [range: 0 ~ 50, default: 1]
I:"rats:ratlantean_automaton"=1

# [range: 0 ~ 50, default: 1]
I:"rats:ratlantean_ratbot"=1

# [range: 0 ~ 50, default: 1]
I:"rats:ratlantean_spirit"=1
I:"silentgems:chaos_wisp"=1
Expand Down
Loading

0 comments on commit 1c88ecf

Please sign in to comment.