Skip to content

Commit

Permalink
Hotfix: Broken Mekanism autocrafting and Chisel textures
Browse files Browse the repository at this point in the history
  • Loading branch information
NielsPilgaard committed Oct 19, 2019
1 parent 50a28e4 commit da55f5f
Show file tree
Hide file tree
Showing 7 changed files with 480 additions and 450 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
# Enigmatica 2: Expert Changelog

## 1.70
## [Unreleased](https://github.com/NillerMedDild/Enigmatica2Expert/tree/HEAD)

**Fixed bugs:**

- After 1.70 update, now creating Mekanism steel instead of Thermal [\#1378](https://github.com/NillerMedDild/Enigmatica2Expert/issues/1378) [[Priority: Critical](https://github.com/NillerMedDild/Enigmatica2Expert/labels/Priority:%20Critical)] [[Status: Completed](https://github.com/NillerMedDild/Enigmatica2Expert/labels/Status:%20Completed)] [[Type: Mod Issue](https://github.com/NillerMedDild/Enigmatica2Expert/labels/Type:%20Mod%20Issue)]

## [1.70a](https://github.com/NillerMedDild/Enigmatica2Expert/tree/1.70a) (2019-10-17)
**Implemented enhancements:**

- Disabled Mekanism WalkieTalkie Server [\#1347](https://github.com/NillerMedDild/Enigmatica2Expert/issues/1347) [[Marker: Config](https://github.com/NillerMedDild/Enigmatica2Expert/labels/Marker:%20Config)] [[Type: Enhancement](https://github.com/NillerMedDild/Enigmatica2Expert/labels/Type:%20Enhancement)]
Expand Down
2 changes: 1 addition & 1 deletion config/AppliedEnergistics2/CustomRecipes.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Configuration file

cache {
S:digest=817268900a340decbbf90f4f0c2a0e54
S:digest=918d1a556cac33f29edd97d4cc92dc8d

# Caching can save processing time, if there are a lot of items. [default: true]
B:enableCache=true
Expand Down
2 changes: 1 addition & 1 deletion config/AppliedEnergistics2/VersionChecker.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
cache {
# Waits as many hours, until it checks again. [range: 0 ~ 168, default: 24]
I:interval=24
S:lastCheck=1571331333022
S:lastCheck=1571462831936
}


Expand Down
2 changes: 1 addition & 1 deletion config/IC2.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
; ic2 general config
; created Oct 17, 2019 6:55:16 PM
; created Oct 19, 2019 7:26:54 AM
;---

[worldgen]
Expand Down
4 changes: 2 additions & 2 deletions config/splash.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Splash screen properties
#Thu Oct 17 18:54:21 CEST 2019
#Sat Oct 19 07:25:55 CEST 2019
background=0xFFFFFF
memoryGood=0x78CB34
font=0x0
Expand All @@ -9,8 +9,8 @@ memoryLow=0xE42F2F
rotate=false
memoryWarn=0xE6E84A
showMemory=false
bar=0xCB3D35
enabled=true
bar=0xCB3D35
resourcePackPath=resources
logoOffset=0
forgeTexture=fml\:textures/gui/forge.png
Expand Down
4 changes: 2 additions & 2 deletions config/unidict/UniDict.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Configuration file

~CONFIG_VERSION: 1.12.2-2.9.3
~CONFIG_VERSION: 1.12.2-2.9.2

dump {
# Enable this to keep track of all the entries.
Expand Down Expand Up @@ -45,7 +45,7 @@ general {
ore
>

# Put here itemstacks that you want to ignore/not unify.
# Put here itemstacks that you want don't want to ignore/not unify.
# Example Format: minecraft:iron_ingot#0 [default: ]
S:itemStacksNamesToIgnore <
ic2:misc_resource#1
Expand Down
Loading

0 comments on commit da55f5f

Please sign in to comment.