Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
NielsPilgaard committed Jan 30, 2021
2 parents 3575a98 + 0e9b1e0 commit 49ab696
Show file tree
Hide file tree
Showing 6 changed files with 514 additions and 706 deletions.
4 changes: 1 addition & 3 deletions MODLIST.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Enigmatica 6 - 0.3.12 Modlist
## Enigmatica 6 - 0.3.13 Modlist
- additional_lights-1.16.4-2.1.3
- AdHooks-1.16.4-6.1.3.1-build.0039
- AI-Improvements-1.16.2-0.3.0
Expand All @@ -17,7 +17,6 @@
- astralsorcery-1.16.4-1.13.9
- AttributeFix-1.16.5-10.0.1
- AutoRegLib-1.6-47
- BackTools-1.16.3-10.0.0
- bambooeverything-1.16.3-forge-1.0.0
- BedBenefits-1.16.5-5.0.3
- bedspreads-forge-1.16.4-5.1.0.1
Expand Down Expand Up @@ -115,7 +114,6 @@
- GameStages-1.16.5-6.0.1
- glassential-forge-1.16.4-1.1.5
- gunswithoutroses-1.16.5-1.0.7
- iChunUtil-1.16.3-10.0.0
- ImmersiveEngineering-1.16.4-4.1.2-129
- ImmersivePetroleum-1.16.4-3.1.0-2
- immersiveposts-1.16.3-3.0.0
Expand Down
18 changes: 9 additions & 9 deletions RemoveClientConfigs.bat.ps1 → RemoveClientConfigs.ps1
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
. "$PSScriptRoot\settings.ps1"

$CONFIGS_TO_REMOVE | ForEach-Object {
$configPath = "$PSScriptRoot/config/$_"
Write-Host "Removing config " -NoNewline
Write-Host $configPath -ForegroundColor Yellow
Remove-Item -Path $configPath -ErrorAction SilentlyContinue -Recurse
}

. "$PSScriptRoot\settings.ps1"

$CONFIGS_TO_REMOVE | ForEach-Object {
$configPath = "$PSScriptRoot/config/$_"
Write-Host "Removing config " -NoNewline
Write-Host $configPath -ForegroundColor Yellow
Remove-Item -Path $configPath -ErrorAction SilentlyContinue -Recurse
}

pause
20 changes: 14 additions & 6 deletions changelogs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
### Enigmatica 6 v0.3.13

_Using Forge-1.16.5-36.0.10_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/CHANGELOG_MODS_0.3.13.txt)_

**Bug Fixes**

- Removed the mod BackTools temporarily to fix a crash [\#1158](https://github.com/NillerMedDild/Enigmatica6/issues/1158)

### Enigmatica 6 v0.3.12: Industrial Foregoing Hotfix & Eidolon Quest Chapter

_Using Forge-1.16.5-36.0.10_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/CHANGELOG_MODS_0.3.11.txt)_
_Using Forge-1.16.5-36.0.10_ | _[Mod Updates](https://github.com/NillerMedDild/Enigmatica6/blob/master/changelogs/CHANGELOG_MODS_0.3.12.txt)_

**Improvements/Changes**

Expand All @@ -9,11 +17,11 @@ _Using Forge-1.16.5-36.0.10_ | _[Mod Updates](https://github.com/NillerMedDild/E

**Bug Fixes**

- Industrial foregoing issues after update to v0.3.11 [\#1145](https://github.com/NillerMedDild/Enigmatica6/issues/1145)
- Titanium 1.16.5-3.2.6 causes crashes, 3.2.6.1 fixes it [\#1143](https://github.com/NillerMedDild/Enigmatica6/issues/1143)
- Occultism Crafting errors [\#1131](https://github.com/NillerMedDild/Enigmatica6/issues/1131)
- Akashic tome dupe bug with Occultism storage actuator [\#1064](https://github.com/NillerMedDild/Enigmatica6/issues/1064)
- Bug: Fletching villagers cannot exist due to modified fletching tables (Fixed in previous version) [\#767](https://github.com/NillerMedDild/Enigmatica6/issues/767)
- Industrial foregoing issues after update to v0.3.11 [\#1145](https://github.com/NillerMedDild/Enigmatica6/issues/1145)
- Titanium 1.16.5-3.2.6 causes crashes, 3.2.6.1 fixes it [\#1143](https://github.com/NillerMedDild/Enigmatica6/issues/1143)
- Occultism Crafting errors [\#1131](https://github.com/NillerMedDild/Enigmatica6/issues/1131)
- Akashic tome dupe bug with Occultism storage actuator [\#1064](https://github.com/NillerMedDild/Enigmatica6/issues/1064)
- Bug: Fletching villagers cannot exist due to modified fletching tables (Fixed in previous version) [\#767](https://github.com/NillerMedDild/Enigmatica6/issues/767)

### Enigmatica 6 v0.3.11

Expand Down
9 changes: 9 additions & 0 deletions changelogs/CHANGELOG_MODS_0.3.13.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
=========================================
Enigmatica6 0.3.12 --> Enigmatica6 0.3.13
=========================================

Removed:
- Back Tools
- iChunUtil

Generated using [ChangelogGenerator 2.0.0-pre3](https://github.com/TheRandomLabs/ChangelogGenerator).
Loading

0 comments on commit 49ab696

Please sign in to comment.