Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
NielsPilgaard committed Nov 9, 2021
2 parents 4d5bd1c + 034308f commit aa45882
Show file tree
Hide file tree
Showing 24 changed files with 2,072 additions and 850 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -173,3 +173,7 @@ config/sidebar_buttons.json
local/ftbultimine/client.snbt
config/entity_culling-client.toml
config/storagedrawers-client.toml
config/roadrunner/common.toml
config/roadrunner/client.toml
defaultconfigs/ftbultimine/ftbultimine.snbt
local/ftbultimine-client.snbt
49 changes: 25 additions & 24 deletions MODLIST.md
Original file line number Diff line number Diff line change
@@ -1,50 +1,51 @@
## CreateTogether - 1.1.6
- [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))
- [[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))
## CreateTogether - 1.1.7
- [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))
- [[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))
- [AutoRegLib-1.6-49.jar](https://www.curseforge.com/minecraft/mc-mods/autoreglib/files/3326041) (by [Vazkii](https://www.curseforge.com/members/vazkii/projects))
- [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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [[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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [ 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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [dynviewdist-2.0.jar](https://www.curseforge.com/minecraft/mc-mods/dynamic-view/files/3358883) (by [someaddon](https://www.curseforge.com/members/someaddon/projects))
- [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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [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))
- [ 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))
- [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))
- [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))
- [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))
- [[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))
- [[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))
- [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))
- [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))
- [Quark-r2.4-316.jar](https://www.curseforge.com/minecraft/mc-mods/quark/files/3394265) (by [Vazkii](https://www.curseforge.com/members/vazkii/projects))
- [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))
- [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))
- [Quark-r2.4-319.jar](https://www.curseforge.com/minecraft/mc-mods/quark/files/3490981) (by [Vazkii](https://www.curseforge.com/members/vazkii/projects))
- [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))
- [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))
- [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))
- [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))
- [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))
- [serverconfigupdater-1.3.jar](https://www.curseforge.com/minecraft/mc-mods/serverconfig-updater/files/3034936) (by [Darkere](https://www.curseforge.com/members/darkere/projects))
- [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))
- [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))
- [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))
- [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))
- [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))
- [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))
Expand Down
2 changes: 1 addition & 1 deletion automation/.build.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"packAuthor": "NillerMedDild",
"minecraftVersion": "1.16.5",
"modLoader": "forge",
"modLoaderVersion": "36.2.2",
"modLoaderVersion": "36.2.4",
"includes": ["config", "defaultconfigs", "kubejs", "local", "packmenu"]
}
2 changes: 1 addition & 1 deletion automation/settings.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ HIGH_CPU_PRIORITY=0;

MODPACK_NAME=Create Together;
MCVER=1.16.5;
FORGEVER=36.2.2;
FORGEVER=36.2.4;
FORGEURL=DISABLE;
12 changes: 7 additions & 5 deletions automation/settings.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ $MODPACK_NAME = "CreateTogether"
$CLIENT_NAME = "CreateTogether"

# Version Of The Modpack
$MODPACK_VERSION = "1.1.6"
$MODPACK_VERSION = "1.1.7"

# Last Version Of The Modpack
# Needed For Changelog Parsing
$LAST_MODPACK_VERSION = "1.1.5"
$LAST_MODPACK_VERSION = "1.1.6"

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

# Can be "alpha", "beta" or "release"
$CLIENT_RELEASE_TYPE = "release"
$CLIENT_RELEASE_TYPE = "beta"

#=====================================================================//
# DEPENDENCIES URL
Expand Down Expand Up @@ -96,9 +96,11 @@ $CONFIGS_TO_REMOVE_FROM_CLIENT_FILES = @(
"MouseTweaks.cfg",
"sidebar_buttons.json",
"entity_culling-client.toml",
"storagedrawers-client.toml")
"storagedrawers-client.toml",
"roadrunner/client.toml",
"roadrunner/common.toml")

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

#=====================================================================//
# SERVER FILE SETTINGS
Expand Down
61 changes: 7 additions & 54 deletions automation/start-automated-server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,47 +2,25 @@
#### Minecraft-Forge Server install/launcher script
#### Linux Version
####
#### Created by: Dijkstra
#### Mascot: Ordinator
#### (Poorly) Edited by: NillerMedDild
####
#### Originally created for use in "All The Mods" modpacks, and since then modified for 1.14+
#### NO OFFICIAL AFFILIATION WITH MOJANG OR FORGE
####
#### This script will fetch the appropriate forge installer
#### and run it to install forge AND fetch Minecraft (from Mojang)
#### If Forge and Minecraft are already installed it will skip
#### download/install and launch server directly (with
#### auto-restart-after-crash logic as well)
####
#### Make sure this is running as BASH
#### You might need to chmod +x before executing
####
#### IF THERE ARE ANY ISSUES
#### Please make a report on the Enigmatica4 github:
#### https://github.com/NillerMedDild/Enigmatica4/issues
#### Please make a report on the most recent Enigmatica version's github:
#### https://github.com/NillerMedDild
#### with the contents of [serverstart.log] and [installer.log]
####
#### Created by: Dijkstra
#### Mascot: Ordinator
#### Maintained by: NillerMedDild
####
#### NO OFFICIAL AFFILIATION WITH MOJANG OR FORGE
####

#For Server Owners


#
#
#
#
#
#
#
# Internal scripty stuff from here on out
# No lines intended to be edited past here
#
#
#
#
#
# Make sure users aren't trying to run script via sh directly (won't work)

if test -f $PWD/remove-client-mods.ps1; then
powershell $PWD/remove-client-mods.ps1 >/dev/null
Expand Down Expand Up @@ -161,31 +139,6 @@ check_dir(){
fi
}

# routine for ping inet connectivity
check_connection(){
if [ ${IGNORE_OFFLINE} -eq 1 ]; then
echo "WARN: Internet connectivity checking is disabled" >>serverstart.log 2>&1
echo "Skipping internet connectivity check"
else
if ping 8.8.8.8 >> /dev/null 2>&1; then
echo "INFO: Ping to Google DNS successfull" >>serverstart.log 2>&1
echo "Ping to Google DNS successfull"
else
echo "ERROR: Ping to Google DNS failed. No internet access?" >>serverstart.log 2>&1
echo "Ping to Google DNS failed. No internet access?"
fi

if ping 4.2.2.1 >> /dev/null 2>&1; then
echo "INFO: Ping to L4 successfull" >>serverstart.log 2>&1
echo "Ping to L4 successfull"
else
echo "ERROR: Ping to L4 failed. No internet access?" >>serverstart.log 2>&1
echo "Ping to L4 failed. No internet access?"
exit 0
fi
fi
}

# routine to make sure necessary binaries are found
check_binaries(){
if [ ! -f ${FORGE_JAR} ] ; then
Expand Down
Loading

0 comments on commit aa45882

Please sign in to comment.