Merge branch 'develop'

EnigmaticaModpacks · Dec 26, 2019 · 55788c2 · 55788c2
2 parents 13e9f61 + daeae95
commit 55788c2
Show file tree

Hide file tree

Showing 37 changed files with 2,855 additions and 3,081 deletions.
diff --git a/.gitignore b/.gitignore
@@ -93,3 +93,8 @@ settings.ps1
 ModpackUploader.ps1
 ModpackUploader.bat
 TwitchExportBuilder.exe
+fonts/Digital-7 Mono.bin
+fonts/Digital-7 Mono.png
+OpenComputersMod-1.7.5.192-lua52-native.64.dll
+OpenComputersMod-1.7.5.192-lua53-native.64.dll
+textures_0.png
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/config/AppliedEnergistics2/CustomRecipes.cfg b/config/AppliedEnergistics2/CustomRecipes.cfg
@@ -1,7 +1,7 @@
 # Configuration file
 
 cache {
-    S:digest=7a180f41c86d6c7c86e052622b2e4897
+    S:digest=10bc55782aea4210fa51577e7297cf4a
 
     # Caching can save processing time, if there are a lot of items. [default: true]
     B:enableCache=true

diff --git a/config/AppliedEnergistics2/VersionChecker.cfg b/config/AppliedEnergistics2/VersionChecker.cfg
@@ -3,7 +3,7 @@
 cache {
     # Waits as many hours, until it checks again. [range: 0 ~ 168, default: 24]
     I:interval=24
-    S:lastCheck=1573674783656
+    S:lastCheck=1577365814115
 }