Skip to content

Commit aa45882

Browse files
committed
Merge branch 'develop'
2 parents 4d5bd1c + 034308f commit aa45882

24 files changed

Lines changed: 2072 additions & 850 deletions

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,3 +173,7 @@ config/sidebar_buttons.json
173173
local/ftbultimine/client.snbt
174174
config/entity_culling-client.toml
175175
config/storagedrawers-client.toml
176+
config/roadrunner/common.toml
177+
config/roadrunner/client.toml
178+
defaultconfigs/ftbultimine/ftbultimine.snbt
179+
local/ftbultimine-client.snbt

MODLIST.md

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,51 @@
1-
## CreateTogether - 1.1.6
2-
- [appleskin-forge-mc1.16.x-2.1.0.jar](https://www.curseforge.com/minecraft/mc-mods/appleskin/files/3395800) (by [squeek502](https://www.curseforge.com/members/squeek502/projects))
3-
- [[Forge 1.16.4/5] v1.20.29](https://www.curseforge.com/minecraft/mc-mods/architectury-forge/files/3415041) (by [shedaniel](https://www.curseforge.com/members/shedaniel/projects))
1+
## CreateTogether - 1.1.7
2+
- [appleskin-forge-mc1.16.x-2.2.0.jar](https://www.curseforge.com/minecraft/mc-mods/appleskin/files/3512372) (by [squeek502](https://www.curseforge.com/members/squeek502/projects))
3+
- [[Forge 1.16.4/5] v1.24.35](https://www.curseforge.com/minecraft/mc-mods/architectury-forge/files/3500014) (by [shedaniel](https://www.curseforge.com/members/shedaniel/projects))
44
- [AutoRegLib-1.6-49.jar](https://www.curseforge.com/minecraft/mc-mods/autoreglib/files/3326041) (by [Vazkii](https://www.curseforge.com/members/vazkii/projects))
55
- [BetterAdvancements-1.16.5-0.1.1.115](https://www.curseforge.com/minecraft/mc-mods/better-advancements/files/3404330) (by [way2muchnoise](https://www.curseforge.com/members/way2muchnoise/projects))
6-
- [buildinggadgets-1.16.5-3.8.0.jar](https://www.curseforge.com/minecraft/mc-mods/building-gadgets/files/3205295) (by [Direwolf20](https://www.curseforge.com/members/direwolf20/projects))
6+
- [buildinggadgets-1.16.5-3.8.2.jar](https://www.curseforge.com/minecraft/mc-mods/building-gadgets/files/3498508) (by [Direwolf20](https://www.curseforge.com/members/direwolf20/projects))
77
- [chocolate-1.3.0-1.16.4.jar](https://www.curseforge.com/minecraft/mc-mods/chocolate-fix/files/3166929) (by [AlcatrazEscapee](https://www.curseforge.com/members/alcatrazescapee/projects))
8-
- [Chunk Pregenerator-V1.16-3.1.0](https://www.curseforge.com/minecraft/mc-mods/chunkpregenerator/files/3419304) (by [Speiger](https://www.curseforge.com/members/speiger/projects))
8+
- [Chunk Pregenerator-V1.16-3.2.0](https://www.curseforge.com/minecraft/mc-mods/chunkpregenerator/files/3507658) (by [Speiger](https://www.curseforge.com/members/speiger/projects))
99
- [[Forge 1.16.4/5] v4.11.26](https://www.curseforge.com/minecraft/mc-mods/cloth-config-forge/files/3311352) (by [shedaniel](https://www.curseforge.com/members/shedaniel/projects))
10-
- [Clumps-6.0.0.25.jar](https://www.curseforge.com/minecraft/mc-mods/clumps/files/3348509) (by [Jaredlll08](https://www.curseforge.com/members/jaredlll08/projects))
10+
- [Clumps-6.0.0.27.jar](https://www.curseforge.com/minecraft/mc-mods/clumps/files/3481298) (by [Jaredlll08](https://www.curseforge.com/members/jaredlll08/projects))
1111
- [cobblegenrandomizer-1.16-5.1.2.jar](https://www.curseforge.com/minecraft/mc-mods/cobblegenrandomizer/files/3147020) (by [HorribleNerd](https://www.curseforge.com/members/horriblenerd/projects))
1212
- [EasyPaxelLITE(Forge1.16.4)vrs1.0.6](https://www.curseforge.com/minecraft/mc-mods/colds-easy-paxel-lite/files/3368153) (by [Coldspell_Games](https://www.curseforge.com/members/coldspell_games/projects))
13-
- [constructionwand-1.16.5-2.2.jar](https://www.curseforge.com/minecraft/mc-mods/construction-wand/files/3285196) (by [ThetaDev](https://www.curseforge.com/members/thetadev/projects))
13+
- [constructionwand-1.16.5-2.4.jar](https://www.curseforge.com/minecraft/mc-mods/construction-wand/files/3499311) (by [ThetaDev](https://www.curseforge.com/members/thetadev/projects))
1414
- [1.16.2+ (3.0.2)](https://www.curseforge.com/minecraft/mc-mods/cookiecore/files/3158118) (by [Ephys](https://www.curseforge.com/members/ephys/projects))
15-
- [ Create 1.16.5 v0.3.2d](https://www.curseforge.com/minecraft/mc-mods/create/files/3419412) (by [simibubi](https://www.curseforge.com/members/simibubi/projects))
15+
- [Create 1.16.5 v0.3.2f](https://www.curseforge.com/minecraft/mc-mods/create/files/3499718) (by [simibubi](https://www.curseforge.com/members/simibubi/projects))
1616
- [decorative_blocks-1.16.4-1.7.2.jar](https://www.curseforge.com/minecraft/mc-mods/decorative-blocks/files/3166283) (by [stohun](https://www.curseforge.com/members/stohun/projects))
1717
- [DefaultOptions_1.16.5-12.2.1.jar](https://www.curseforge.com/minecraft/mc-mods/default-options/files/3330403) (by [BlayTheNinth](https://www.curseforge.com/members/blaytheninth/projects))
18-
- [DrawersTooltip-1.16.2-2.1.0.jar](https://www.curseforge.com/minecraft/mc-mods/drawers-tooltip/files/3035686) (by [Snownee_](https://www.curseforge.com/members/snownee_/projects))
18+
- [DrawersTooltip-1.16.2-2.1.1.jar](https://www.curseforge.com/minecraft/mc-mods/drawers-tooltip/files/3491850) (by [Snownee_](https://www.curseforge.com/members/snownee_/projects))
1919
- [dynviewdist-2.0.jar](https://www.curseforge.com/minecraft/mc-mods/dynamic-view/files/3358883) (by [someaddon](https://www.curseforge.com/members/someaddon/projects))
20-
- [EnigmaticGraves-1.6.1.jar](https://www.curseforge.com/minecraft/mc-mods/enigmatic-graves/files/3421782) (by [Quarris](https://www.curseforge.com/members/quarris/projects))
20+
- [EnigmaticGraves-1.6.5.jar](https://www.curseforge.com/minecraft/mc-mods/enigmatic-graves/files/3507614) (by [Quarris](https://www.curseforge.com/members/quarris/projects))
2121
- [EntityCulling-1.16.5-2.1.6.jar](https://www.curseforge.com/minecraft/mc-mods/entity-culling/files/3328602) (by [meldexun](https://www.curseforge.com/members/meldexun/projects))
22-
- [ftb-chunks-forge-1605.3.1-build.41.jar](https://www.curseforge.com/minecraft/mc-mods/ftb-chunks-forge/files/3409573) (by [FTB](https://www.curseforge.com/members/ftb/projects))
23-
- [ftb-library-forge-1605.3.1-build.58.jar](https://www.curseforge.com/minecraft/mc-mods/ftb-library-forge/files/3415091) (by [FTB](https://www.curseforge.com/members/ftb/projects))
24-
- [ftb-teams-forge-1605.2.1-build.20.jar](https://www.curseforge.com/minecraft/mc-mods/ftb-teams-forge/files/3409580) (by [FTB](https://www.curseforge.com/members/ftb/projects))
25-
- [ftb-ultimine-forge-1605.3.0-build.25.jar](https://www.curseforge.com/minecraft/mc-mods/ftb-ultimine-forge/files/3409570) (by [FTB](https://www.curseforge.com/members/ftb/projects))
22+
- [ftb-chunks-forge-1605.3.2-build.79.jar](https://www.curseforge.com/minecraft/mc-mods/ftb-chunks-forge/files/3509329) (by [FTB](https://www.curseforge.com/members/ftb/projects))
23+
- [ftb-library-forge-1605.3.4-build.81.jar](https://www.curseforge.com/minecraft/mc-mods/ftb-library-forge/files/3514173) (by [FTB](https://www.curseforge.com/members/ftb/projects))
24+
- [ftb-teams-forge-1605.2.3-build.38.jar](https://www.curseforge.com/minecraft/mc-mods/ftb-teams-forge/files/3492657) (by [FTB](https://www.curseforge.com/members/ftb/projects))
25+
- [ftb-ultimine-forge-1605.3.1-build.42.jar](https://www.curseforge.com/minecraft/mc-mods/ftb-ultimine-forge/files/3517169) (by [FTB](https://www.curseforge.com/members/ftb/projects))
2626
- [FastFurnace-1.16.4-4.4.0.jar](https://www.curseforge.com/minecraft/mc-mods/fastfurnace/files/3172796) (by [Shadows_of_Fire](https://www.curseforge.com/members/shadows_of_fire/projects))
2727
- [FastWorkbench-1.16.4-4.5.1.jar](https://www.curseforge.com/minecraft/mc-mods/fastworkbench/files/3245271) (by [Shadows_of_Fire](https://www.curseforge.com/members/shadows_of_fire/projects))
28-
- [ferritecore-2.0.5-forge.jar](https://www.curseforge.com/minecraft/mc-mods/ferritecore/files/3358428) (by [malte0811](https://www.curseforge.com/members/malte0811/projects))
29-
- [flywheel-1.16-0.2.3.jar](https://www.curseforge.com/minecraft/mc-mods/flywheel/files/3419392) (by [jozufozu](https://www.curseforge.com/members/jozufozu/projects))
28+
- [ferritecore-2.1.0-forge.jar](https://www.curseforge.com/minecraft/mc-mods/ferritecore/files/3485636) (by [malte0811](https://www.curseforge.com/members/malte0811/projects))
29+
- [flywheel-1.16-0.2.4.jar](https://www.curseforge.com/minecraft/mc-mods/flywheel/files/3459739) (by [jozufozu](https://www.curseforge.com/members/jozufozu/projects))
3030
- [invtweaks-1.16.4-1.0.1.jar](https://www.curseforge.com/minecraft/mc-mods/inventory-tweaks-renewed/files/3102237) (by [David1544](https://www.curseforge.com/members/david1544/projects))
31-
- [jei-1.16.5-7.7.1.118.jar](https://www.curseforge.com/minecraft/mc-mods/jei/files/3414898) (by [mezz](https://www.curseforge.com/members/mezz/projects))
32-
- [kubejs-forge-1605.3.15-build.80.jar](https://www.curseforge.com/minecraft/mc-mods/kubejs-forge/files/3425028) (by [LatvianModder](https://www.curseforge.com/members/latvianmodder/projects))
31+
- [jei-1.16.5-7.7.1.130.jar](https://www.curseforge.com/minecraft/mc-mods/jei/files/3514175) (by [mezz](https://www.curseforge.com/members/mezz/projects))
32+
- [kubejs-forge-1605.3.18-build.154.jar](https://www.curseforge.com/minecraft/mc-mods/kubejs-forge/files/3516226) (by [LatvianModder](https://www.curseforge.com/members/latvianmodder/projects))
3333
- [kubejs-create-1605.1.2-build.7.jar](https://www.curseforge.com/minecraft/mc-mods/kubejs-create/files/3407451) (by [LatvianModder](https://www.curseforge.com/members/latvianmodder/projects))
3434
- [ LazyDFU 0.1.3](https://www.curseforge.com/minecraft/mc-mods/lazy-dfu-forge/files/3249059) (by [Corgi_Taco](https://www.curseforge.com/members/corgi_taco/projects))
35-
- [logprot-1.16-1.3.jar](https://www.curseforge.com/minecraft/mc-mods/login-protection/files/3038361) (by [someaddon](https://www.curseforge.com/members/someaddon/projects))
35+
- [logprot-1.16-1.5.jar](https://www.curseforge.com/minecraft/mc-mods/login-protection/files/3497459) (by [someaddon](https://www.curseforge.com/members/someaddon/projects))
3636
- [1.16.2 - 1.16.5 (3.2.0)](https://www.curseforge.com/minecraft/mc-mods/magic-feather/files/3224434) (by [Ephys](https://www.curseforge.com/members/ephys/projects))
3737
- [[1.16.5] MoreOverlays 1.18.15](https://www.curseforge.com/minecraft/mc-mods/more-overlays-updated/files/3395133) (by [RiDGo8](https://www.curseforge.com/members/ridgo8/projects))
3838
- [[1.16.2+] Mouse Tweaks 2.14](https://www.curseforge.com/minecraft/mc-mods/mouse-tweaks/files/3202662) (by [YaLTeR](https://www.curseforge.com/members/yalter/projects))
39-
- [PackMenu-1.16.4-2.4.2.jar](https://www.curseforge.com/minecraft/mc-mods/packmenu/files/3292171) (by [Shadows_of_Fire](https://www.curseforge.com/members/shadows_of_fire/projects))
40-
- [Placebo-1.16.4-4.5.0.jar](https://www.curseforge.com/minecraft/mc-mods/placebo/files/3331459) (by [Shadows_of_Fire](https://www.curseforge.com/members/shadows_of_fire/projects))
41-
- [Quark-r2.4-316.jar](https://www.curseforge.com/minecraft/mc-mods/quark/files/3394265) (by [Vazkii](https://www.curseforge.com/members/vazkii/projects))
39+
- [PackMenu-1.16.5-2.5.0.jar](https://www.curseforge.com/minecraft/mc-mods/packmenu/files/3475660) (by [Shadows_of_Fire](https://www.curseforge.com/members/shadows_of_fire/projects))
40+
- [Placebo-1.16.5-4.6.0.jar](https://www.curseforge.com/minecraft/mc-mods/placebo/files/3437009) (by [Shadows_of_Fire](https://www.curseforge.com/members/shadows_of_fire/projects))
41+
- [Quark-r2.4-319.jar](https://www.curseforge.com/minecraft/mc-mods/quark/files/3490981) (by [Vazkii](https://www.curseforge.com/members/vazkii/projects))
4242
- [RandomPatches 2.4.4-forge](https://www.curseforge.com/minecraft/mc-mods/randompatches-forge/files/3211323) (by [TheRandomLabs](https://www.curseforge.com/members/therandomlabs/projects))
4343
- [Refined Storage 1.9.15](https://www.curseforge.com/minecraft/mc-mods/refined-storage/files/3400575) (by [raoulvdberge](https://www.curseforge.com/members/raoulvdberge/projects))
44-
- [rhino-1605.1.1-build.21.jar](https://www.curseforge.com/minecraft/mc-mods/rhino/files/3354586) (by [LatvianModder](https://www.curseforge.com/members/latvianmodder/projects))
44+
- [rhino-forge-1605.1.5-build.73.jar](https://www.curseforge.com/minecraft/mc-mods/rhino/files/3516138) (by [LatvianModder](https://www.curseforge.com/members/latvianmodder/projects))
45+
- [RoadRunner-mc1.16.5-1.3.0.jar](https://www.curseforge.com/minecraft/mc-mods/roadrunner/files/3487988) (by [MaxNeedsSnacks](https://www.curseforge.com/members/maxneedssnacks/projects))
4546
- [serverconfigupdater-1.3.jar](https://www.curseforge.com/minecraft/mc-mods/serverconfig-updater/files/3034936) (by [Darkere](https://www.curseforge.com/members/darkere/projects))
4647
- [simplemagnets-1.1.2-mc1.16.5](https://www.curseforge.com/minecraft/mc-mods/simple-magnets/files/3239732) (by [SuperMartijn642](https://www.curseforge.com/members/supermartijn642/projects))
47-
- [simplybackpacks-1.16.5-1.5.1-build.4.jar](https://www.curseforge.com/minecraft/mc-mods/simply-backpacks/files/3345102) (by [Flanks255](https://www.curseforge.com/members/flanks255/projects))
48+
- [simplybackpacks-1.16.5-1.5.2-build.8.jar](https://www.curseforge.com/minecraft/mc-mods/simply-backpacks/files/3479276) (by [Flanks255](https://www.curseforge.com/members/flanks255/projects))
4849
- [StorageDrawers-1.16.3-8.3.0.jar](https://www.curseforge.com/minecraft/mc-mods/storage-drawers/files/3402515) (by [Texelsaur](https://www.curseforge.com/members/texelsaur/projects))
4950
- [supermartijn642configlib-1.0.9-mc1.16](https://www.curseforge.com/minecraft/mc-mods/supermartijn642s-config-lib/files/3413938) (by [SuperMartijn642](https://www.curseforge.com/members/supermartijn642/projects))
5051
- [supermartijn642corelib-1.0.12-mc1.16.5](https://www.curseforge.com/minecraft/mc-mods/supermartijn642s-core-lib/files/3413422) (by [SuperMartijn642](https://www.curseforge.com/members/supermartijn642/projects))

automation/.build.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"packAuthor": "NillerMedDild",
33
"minecraftVersion": "1.16.5",
44
"modLoader": "forge",
5-
"modLoaderVersion": "36.2.2",
5+
"modLoaderVersion": "36.2.4",
66
"includes": ["config", "defaultconfigs", "kubejs", "local", "packmenu"]
77
}

automation/settings.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ HIGH_CPU_PRIORITY=0;
1414

1515
MODPACK_NAME=Create Together;
1616
MCVER=1.16.5;
17-
FORGEVER=36.2.2;
17+
FORGEVER=36.2.4;
1818
FORGEURL=DISABLE;

automation/settings.ps1

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ $MODPACK_NAME = "CreateTogether"
2929
$CLIENT_NAME = "CreateTogether"
3030

3131
# Version Of The Modpack
32-
$MODPACK_VERSION = "1.1.6"
32+
$MODPACK_VERSION = "1.1.7"
3333

3434
# Last Version Of The Modpack
3535
# Needed For Changelog Parsing
36-
$LAST_MODPACK_VERSION = "1.1.5"
36+
$LAST_MODPACK_VERSION = "1.1.6"
3737

3838
# =====================================================================//
3939
# CHANGELOG SETTINGS
@@ -59,7 +59,7 @@ $CLIENT_CHANGELOG = "The Changelog is currently being written, it should be done
5959
$GAME_VERSIONS = @(8203)
6060

6161
# Can be "alpha", "beta" or "release"
62-
$CLIENT_RELEASE_TYPE = "release"
62+
$CLIENT_RELEASE_TYPE = "beta"
6363

6464
#=====================================================================//
6565
# DEPENDENCIES URL
@@ -96,9 +96,11 @@ $CONFIGS_TO_REMOVE_FROM_CLIENT_FILES = @(
9696
"MouseTweaks.cfg",
9797
"sidebar_buttons.json",
9898
"entity_culling-client.toml",
99-
"storagedrawers-client.toml")
99+
"storagedrawers-client.toml",
100+
"roadrunner/client.toml",
101+
"roadrunner/common.toml")
100102

101-
$FOLDERS_TO_REMOVE_FROM_CLIENT_FILES = @("local/ftbutilities", "local/ftbchunks/data", "local/ftbultimine")
103+
$FOLDERS_TO_REMOVE_FROM_CLIENT_FILES = @("local/ftbutilities", "local/ftbchunks/data", "local/ftbultimine", "local/ftbultimine-client.snbt", "defaultconfigs/ftbultimine")
102104

103105
#=====================================================================//
104106
# SERVER FILE SETTINGS

automation/start-automated-server.sh

Lines changed: 7 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,25 @@
22
#### Minecraft-Forge Server install/launcher script
33
#### Linux Version
44
####
5-
#### Created by: Dijkstra
6-
#### Mascot: Ordinator
7-
#### (Poorly) Edited by: NillerMedDild
8-
####
9-
#### Originally created for use in "All The Mods" modpacks, and since then modified for 1.14+
10-
#### NO OFFICIAL AFFILIATION WITH MOJANG OR FORGE
11-
####
125
#### This script will fetch the appropriate forge installer
136
#### and run it to install forge AND fetch Minecraft (from Mojang)
147
#### If Forge and Minecraft are already installed it will skip
158
#### download/install and launch server directly (with
169
#### auto-restart-after-crash logic as well)
1710
####
18-
#### Make sure this is running as BASH
1911
#### You might need to chmod +x before executing
2012
####
2113
#### IF THERE ARE ANY ISSUES
22-
#### Please make a report on the Enigmatica4 github:
23-
#### https://github.com/NillerMedDild/Enigmatica4/issues
14+
#### Please make a report on the most recent Enigmatica version's github:
15+
#### https://github.com/NillerMedDild
2416
#### with the contents of [serverstart.log] and [installer.log]
2517
####
18+
#### Created by: Dijkstra
19+
#### Mascot: Ordinator
20+
#### Maintained by: NillerMedDild
21+
####
22+
#### NO OFFICIAL AFFILIATION WITH MOJANG OR FORGE
2623
####
27-
28-
#For Server Owners
29-
30-
31-
#
32-
#
33-
#
34-
#
35-
#
36-
#
37-
#
38-
# Internal scripty stuff from here on out
39-
# No lines intended to be edited past here
40-
#
41-
#
42-
#
43-
#
44-
#
45-
# Make sure users aren't trying to run script via sh directly (won't work)
4624

4725
if test -f $PWD/remove-client-mods.ps1; then
4826
powershell $PWD/remove-client-mods.ps1 >/dev/null
@@ -161,31 +139,6 @@ check_dir(){
161139
fi
162140
}
163141

164-
# routine for ping inet connectivity
165-
check_connection(){
166-
if [ ${IGNORE_OFFLINE} -eq 1 ]; then
167-
echo "WARN: Internet connectivity checking is disabled" >>serverstart.log 2>&1
168-
echo "Skipping internet connectivity check"
169-
else
170-
if ping 8.8.8.8 >> /dev/null 2>&1; then
171-
echo "INFO: Ping to Google DNS successfull" >>serverstart.log 2>&1
172-
echo "Ping to Google DNS successfull"
173-
else
174-
echo "ERROR: Ping to Google DNS failed. No internet access?" >>serverstart.log 2>&1
175-
echo "Ping to Google DNS failed. No internet access?"
176-
fi
177-
178-
if ping 4.2.2.1 >> /dev/null 2>&1; then
179-
echo "INFO: Ping to L4 successfull" >>serverstart.log 2>&1
180-
echo "Ping to L4 successfull"
181-
else
182-
echo "ERROR: Ping to L4 failed. No internet access?" >>serverstart.log 2>&1
183-
echo "Ping to L4 failed. No internet access?"
184-
exit 0
185-
fi
186-
fi
187-
}
188-
189142
# routine to make sure necessary binaries are found
190143
check_binaries(){
191144
if [ ! -f ${FORGE_JAR} ] ; then

0 commit comments

Comments
 (0)