Skip to content

Commit

Permalink
Merge pull request #2541 from NillerMedDild/develop
Browse files Browse the repository at this point in the history
0.5.1
  • Loading branch information
NielsPilgaard authored Jun 26, 2021
2 parents 0441720 + 98ac205 commit e935621
Show file tree
Hide file tree
Showing 332 changed files with 5,792 additions and 6,117 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -175,3 +175,6 @@ config/cfm-client.toml
config/entity_culling-client.toml
config/terraforged/performance_internal.conf
config/gravestone-client.toml
config/jecalculation/record.json
config/topaddons-client.toml
config/diet-client.toml
11 changes: 7 additions & 4 deletions automation/settings.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ $MODPACK_NAME = "Enigmatica6"
$CLIENT_NAME = "Enigmatica6"

# Version Of The Modpack
$MODPACK_VERSION = "0.5.0"
$MODPACK_VERSION = "0.5.1"

# Last Version Of The Modpack
# Needed For Changelog Parsing
$LAST_MODPACK_VERSION = "0.4.14"
$LAST_MODPACK_VERSION = "0.5.0"

# =====================================================================//
# CHANGELOG SETTINGS
Expand Down Expand Up @@ -139,7 +139,10 @@ $CONFIGS_TO_REMOVE_FROM_CLIENT_FILES = @(
"cfm-client.toml",
"entity_culling-client.toml",
"terraforged/performance_internal.conf",
"gravestone-client.toml"
"gravestone-client.toml",
"jecalculation/record.json",
"topaddons-client.toml",
"diet-client.toml"
)

#=====================================================================//
Expand Down Expand Up @@ -173,7 +176,7 @@ $IsWindows = $true

# Toggle twitch-export-builder (automatic building of the manifest zip) on/off
# Default: $true
$ENABLE_CURSE_CLIENT_MODULE = $true
$ENABLE_CURSE_CLIENT_MODULE = $false

# Toggle the modpack uploader on/off
# Setting this to $false will also disable the Server File and Changelog Generator Modules.
Expand Down
270 changes: 144 additions & 126 deletions changelogs/CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion config/Mekanism/general.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#Heat capacity of Thermal Evaporation Tower layers (increases amount of energy needed to increase temperature).
heatCapacity = 100.0
#Temperature to amount produced ratio for Thermal Evaporation Tower.
tempMultiplier = 0.4
tempMultiplier = 0.8
#Thermal Evaporation Tower heat loss per tick.
heatDissipation = 0.02

Expand Down
26 changes: 0 additions & 26 deletions config/adhooks/hooks/prototype.cfg

This file was deleted.

26 changes: 0 additions & 26 deletions config/adhooks/hooks/pudge.cfg

This file was deleted.

26 changes: 0 additions & 26 deletions config/adhooks/hooks/spear.cfg

This file was deleted.

26 changes: 0 additions & 26 deletions config/adhooks/hooks/web.cfg

This file was deleted.

42 changes: 0 additions & 42 deletions config/adhooks/launchers/prototype.cfg

This file was deleted.

42 changes: 0 additions & 42 deletions config/adhooks/launchers/pudge.cfg

This file was deleted.

42 changes: 0 additions & 42 deletions config/adhooks/launchers/spear.cfg

This file was deleted.

42 changes: 0 additions & 42 deletions config/adhooks/launchers/web.cfg

This file was deleted.

40 changes: 0 additions & 40 deletions config/aiimprovements-common.toml

This file was deleted.

Loading

0 comments on commit e935621

Please sign in to comment.