Compare commits
10 commits
1f80b683f2
...
9da663c996
Author | SHA1 | Date | |
---|---|---|---|
9da663c996 | |||
bf18f9f062 | |||
71efe9f08c | |||
0799952e1f | |||
ce3870a2bf | |||
9774d9eadb | |||
baca57f7a4 | |||
e1b144a7fb | |||
d35d73b98f | |||
a1b353a803 |
27 changed files with 108 additions and 45 deletions
70
.gitmodules
vendored
70
.gitmodules
vendored
|
@ -1,39 +1,39 @@
|
|||
[submodule "Minecraft/Mods/Arias-Essentials"]
|
||||
path = Minecraft/Mods/Arias-Essentials
|
||||
url = https://git.zontreck.com/MinecraftMods/Arias-Essentials
|
||||
url = ssh://git@git.zontreck.com:1212/AriasCreations/Minecraft/AriasEssentials
|
||||
[submodule "AriasCreations"]
|
||||
path = AriasCreations
|
||||
url = git@github.com:AriasCreations/AriasCreations
|
||||
[submodule "ACSE"]
|
||||
path = ACSE
|
||||
url = https://git.zontreck.com/zontreck/ACSE
|
||||
url = ssh://git@git.zontreck.com:1212/zontreck/ACSE
|
||||
[submodule "Beachparty"]
|
||||
path = Beachparty
|
||||
url = git@github.com:zontreck/Beachparty
|
||||
[submodule "CardsOfUtterNonsense_Old"]
|
||||
path = CardsOfUtterNonsense_Old
|
||||
url = git@github.com:AriasCreations/CardsOfUtterNonsense
|
||||
url = ssh://git@git.zontreck.com:1212/AriasCreations/CardsOfUtterNonsense_old
|
||||
[submodule "ConanServerManager"]
|
||||
path = ConanServerManager
|
||||
url = https://git.zontreck.com/AriasCreations/ConanServerManager
|
||||
url = ssh://git@git.zontreck.com:1212/AriasCreations/ConanServerManager
|
||||
[submodule "EagleEye"]
|
||||
path = EagleEye
|
||||
url = https://git.zontreck.com/zontreck/EagleEye
|
||||
url = ssh://git@git.zontreck.com:1212/zontreck/EagleEye
|
||||
[submodule "FalloutOS"]
|
||||
path = FalloutOS
|
||||
url = https://git.zontreck.com/zontreck/FalloutOS
|
||||
url = ssh://git@git.zontreck.com:1212/zontreck/FalloutOS
|
||||
[submodule "Minecraft/Mods/Fire"]
|
||||
path = Minecraft/Mods/Fire
|
||||
url = https://git.zontreck.com/MinecraftMods/Fire
|
||||
url = ssh://git@git.zontreck.com:1212/AriasCreations/Minecraft/Fire
|
||||
[submodule "Minecraft/Mods/Thresholds"]
|
||||
path = Minecraft/Mods/Thresholds
|
||||
url = https://git.zontreck.com/MinecraftMods/Thresholds
|
||||
url = ssh://git@git.zontreck.com:1212/AriasCreations/Minecraft/Thresholds
|
||||
[submodule "furware"]
|
||||
path = furware
|
||||
url = https://git.zontreck.com/AriasCreations/furware
|
||||
url = ssh://git@git.zontreck.com:1212/AriasCreations/furware
|
||||
[submodule "GenericNextGenCore"]
|
||||
path = GenericNextGenCore
|
||||
url = https://git.zontreck.com/AriasCreations/GenericNextGenCore
|
||||
url = ssh://git@git.zontreck.com:1212/AriasCreations/NextGenCore
|
||||
[submodule "VerboseSleep"]
|
||||
path = VerboseSleep
|
||||
url = git@github.com:zontreck/VerboseSleep
|
||||
|
@ -60,43 +60,40 @@
|
|||
url = git@github.com:zontreck/PassTool
|
||||
[submodule "Minecraft/MinecraftLauncher"]
|
||||
path = Minecraft/MinecraftLauncher
|
||||
url = https://git.zontreck.com/zontreck/MinecraftLauncher
|
||||
url = ssh://git@git.zontreck.com:1212/zontreck/MinecraftLauncher
|
||||
[submodule "LibAC"]
|
||||
path = LibAC
|
||||
url = https://git.zontreck.com/zontreck/LibAC
|
||||
url = ssh://git@git.zontreck.com:1212/zontreck/LibAC
|
||||
[submodule "ToonTown/ToonTownOnline"]
|
||||
path = ToonTown/ToonTownOnline
|
||||
url = https://git.zontreck.com/zontreck/TTO
|
||||
url = ssh://git@git.zontreck.com:1212/zontreck/ToonTownOnline
|
||||
[submodule "ToonTown/ToonTownRewritten"]
|
||||
path = ToonTown/ToonTownRewritten
|
||||
url = https://git.zontreck.com/zontreck/ToonTownRewritten
|
||||
[submodule "Minecraft/snowblower"]
|
||||
path = Minecraft/snowblower
|
||||
url = git@github.com:neoforged/snowblower
|
||||
url = ssh://git@git.zontreck.com:1212/zontreck/ToonTownRewritten
|
||||
[submodule "Minecraft/Mods/LibZontreck"]
|
||||
path = Minecraft/Mods/LibZontreck
|
||||
url = https://git.zontreck.com/MinecraftMods/LibZontreck
|
||||
url = ssh://git@git.zontreck.com:1212/AriasCreations/Minecraft/LibZontreck
|
||||
[submodule "Minecraft/Mods/WatchMyDurability"]
|
||||
path = Minecraft/Mods/WatchMyDurability
|
||||
url = https://git.zontreck.com/MinecraftMods/WatchMyDurability
|
||||
url = ssh://git@git.zontreck.com:1212/AriasCreations/Minecraft/WatchMyDurability
|
||||
[submodule "ToonTown/ToonTownOnlineAssets"]
|
||||
path = ToonTown/ToonTownOnlineAssets
|
||||
url = https://git.zontreck.com/zontreck/TTOResources
|
||||
url = ssh://git@git.zontreck.com:1212/zontreck/ToonTownOnlineAssets
|
||||
[submodule "Harbinger/HarbingerCDN"]
|
||||
path = Harbinger/HarbingerCDN
|
||||
url = https://git.zontreck.com/zontreck/HarbingerCDN
|
||||
url = ssh://git@git.zontreck.com:1212/zontreck/HarbingerCDN
|
||||
[submodule "Harbinger/HarbingerProjMgr"]
|
||||
path = Harbinger/HarbingerProjMgr
|
||||
url = https://git.zontreck.com/zontreck/HarbingerProjMgr
|
||||
url = ssh://git@git.zontreck.com:1212/zontreck/HarbingerProjMgr
|
||||
[submodule "CardsOfUtterNonsense"]
|
||||
path = CardsOfUtterNonsense
|
||||
url = https://git.zontreck.com/AriasCreations/CardsOfUtterNonsense
|
||||
url = ssh://git@git.zontreck.com:1212/AriasCreations/CardsOfUtterNonsense
|
||||
[submodule "Minecraft/Minecraft"]
|
||||
path = Minecraft/Minecraft
|
||||
url = https://git.zontreck.com/zontreck/Minecraft
|
||||
url = ssh://git@git.zontreck.com:1212/zontreck/Minecraft
|
||||
[submodule "wiiqt"]
|
||||
path = wiiqt
|
||||
url = https://git.zontreck.com/zontreck/wiiqt
|
||||
url = ssh://git@git.zontreck.com:1212/zontreck/WiiQtTools
|
||||
[submodule "SecondLife/Roleplay-Message-Board"]
|
||||
path = SecondLife/Roleplay-Message-Board
|
||||
url = git@github.com:AriasCreations/Roleplay-Message-Board
|
||||
|
@ -105,7 +102,7 @@
|
|||
url = git@github.com:MCPHackers/RetroMCP-Java
|
||||
[submodule "Minecraft/Mods/EngineersDecor"]
|
||||
path = Minecraft/Mods/EngineersDecor
|
||||
url = https://git.zontreck.com/MinecraftMods/EngineersDecor
|
||||
url = ssh://git@git.zontreck.com:1212/AriasCreations/Minecraft/EngineersDecor
|
||||
branch = 1.20
|
||||
[submodule "Time-Tools"]
|
||||
path = Time-Tools
|
||||
|
@ -122,3 +119,24 @@
|
|||
[submodule "Minecraft/ATLauncher"]
|
||||
path = Minecraft/ATLauncher
|
||||
url = git@github.com:ATLauncher/ATLauncher.git
|
||||
[submodule "Minecraft/ACLauncher"]
|
||||
path = Minecraft/ACLauncher
|
||||
url = ssh://git@git.zontreck.com:1212/zontreck/ACLauncher
|
||||
[submodule "Minecraft/MinecraftBuilds"]
|
||||
path = Minecraft/MinecraftBuilds
|
||||
url = ssh://git@git.zontreck.com:1212/zontreck/MinecraftBuilds
|
||||
[submodule "Minecraft/LaunchWrapper"]
|
||||
path = Minecraft/LaunchWrapper
|
||||
url = git@github.com:MCPHackers/LaunchWrapper.git
|
||||
[submodule "Minecraft/Mods/BetterEnd"]
|
||||
path = Minecraft/Mods/BetterEnd
|
||||
url = ssh://git@git.zontreck.com:1212/AriasCreations/Minecraft/BetterEnd
|
||||
[submodule "SecondLife/Sim-Status-Notifier"]
|
||||
path = SecondLife/Sim-Status-Notifier
|
||||
url = ssh://git@git.zontreck.com:1212/AriasCreations/Sim-Status-Notifier
|
||||
[submodule "SecondLife/GameTables"]
|
||||
path = SecondLife/GameTables
|
||||
url = ssh://git@git.zontreck.com:1212/ariascreations/game-tables
|
||||
[submodule "bashtop"]
|
||||
path = bashtop
|
||||
url = git@github.com:aristocratos/bashtop.git
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit e129fefb2e50e3abe8b9f4b0be177476966ce2be
|
||||
Subproject commit f64e8065e7a24ff4172544f937f37fa5e3846e63
|
|
@ -1 +1 @@
|
|||
Subproject commit 56581348a2c54ed71b96d96681a4c17d491a38c3
|
||||
Subproject commit b7ed76a09d1953d75968cbc14a53f724c11fb5f9
|
|
@ -1,8 +1,20 @@
|
|||
#!/bin/bash
|
||||
|
||||
function ban2()
|
||||
{
|
||||
echo "==========================================="
|
||||
echo "${1}"
|
||||
echo "==========================================="
|
||||
}
|
||||
|
||||
export PATH="$PATH:$(pwd)/depot_tools"
|
||||
pushd skia
|
||||
|
||||
ban2 "Building Skia"
|
||||
git clean -xfd
|
||||
git reset --hard
|
||||
git pull
|
||||
|
||||
python tools/git-sync-deps
|
||||
gn gen out/Release-x64 --args="is_debug=false is_official_build=true skia_use_system_expat=false skia_use_system_icu=false skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false skia_use_sfntly=false skia_use_freetype=true skia_use_harfbuzz=true skia_pdf_subset_harfbuzz=true skia_use_system_freetype2=false skia_use_system_harfbuzz=false"
|
||||
ninja -C out/Release-x64 skia modules
|
||||
|
@ -12,9 +24,15 @@ popd
|
|||
|
||||
pushd aseprite
|
||||
|
||||
git clean -xfd
|
||||
git reset --hard
|
||||
git pull
|
||||
|
||||
rm -rf build
|
||||
mkdir build
|
||||
pushd build
|
||||
|
||||
ban2 "Building Aseprite"
|
||||
cmake -G Ninja -DLAF_BACKEND=skia -DSKIA_DIR=../../skia -DSKIA_LIBRARY_DIR=../../skia/out/Release-x64 -DSKIA_LIBRARY=../../skia/out/Release-x64/libskia.a ..
|
||||
ninja aseprite
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit d5945f63b7cdf48bd4da33c54486656e372d9988
|
||||
Subproject commit d913a4c22298d04a9c380b699fb8491bef344d79
|
2
LibAC
2
LibAC
|
@ -1 +1 @@
|
|||
Subproject commit a5f943dc198194773c79da7ef3b16f8959c873e4
|
||||
Subproject commit 47e6a466f2358bda5dc1e93c255450ebe059fa50
|
1
Minecraft/ACLauncher
Submodule
1
Minecraft/ACLauncher
Submodule
|
@ -0,0 +1 @@
|
|||
Subproject commit 9134bc5d19872a02c47a6c0f993ab31985879242
|
|
@ -1 +1 @@
|
|||
Subproject commit e859b38044f0eeaccfbce53f8c462be68aced2b9
|
||||
Subproject commit ccd85ebeae67539e18d7fc33ac72063cf85ddfe7
|
1
Minecraft/LaunchWrapper
Submodule
1
Minecraft/LaunchWrapper
Submodule
|
@ -0,0 +1 @@
|
|||
Subproject commit 304d09d3b3622671f44260aa5354240f722c8a8c
|
|
@ -1 +1 @@
|
|||
Subproject commit 16587481d52f9c6cc9461dd859d442ea3adce693
|
||||
Subproject commit 3bd7bcf3ee1c663f393c82e845a777dfa2d7d5b4
|
1
Minecraft/MinecraftBuilds
Submodule
1
Minecraft/MinecraftBuilds
Submodule
|
@ -0,0 +1 @@
|
|||
Subproject commit 18f2a8437f18625ae1d7ed7648584fb1bb06afaa
|
|
@ -1 +1 @@
|
|||
Subproject commit 1a681d4c0a037193e14dd3cd0c781ebf38b9e47b
|
||||
Subproject commit 58cc93c5797fb3c4eae165a6d6d1da9854a0f0d8
|
|
@ -1 +1 @@
|
|||
Subproject commit ed20b4f5fbd897ae00f55ad6b3a42918a0e88964
|
||||
Subproject commit a9fdb95c39cb5f7ae3abc17a2c0d8b32448059f5
|
1
Minecraft/Mods/BetterEnd
Submodule
1
Minecraft/Mods/BetterEnd
Submodule
|
@ -0,0 +1 @@
|
|||
Subproject commit 35c56c534232ded7bbb2c97b00f9e7fc221dddf4
|
|
@ -1 +1 @@
|
|||
Subproject commit c3d9096e6360f5b45d4c2c0264d6dfd0e3852ede
|
||||
Subproject commit 06cbd4fbf55a896e478b9bf24d60b574a622b610
|
|
@ -1 +1 @@
|
|||
Subproject commit 1fbd10471ffa8e3d51989c4574f925033ef08a56
|
||||
Subproject commit 4a7a8dd2027a9e441a08ee788b2388304aa47a3d
|
|
@ -1 +1 @@
|
|||
Subproject commit fe33c138f64454f4e55d35511f8f6122510afbc5
|
||||
Subproject commit 0c9a74628339542a9bfcb52dff02d67ded5a3fe7
|
|
@ -1 +1 @@
|
|||
Subproject commit e5ac82527824b6176e79a8f3c12deed01f94faae
|
||||
Subproject commit 7813fcc9f766a3b5afee4fe16610677ad1593570
|
22
Minecraft/setup_aclauncher
Executable file
22
Minecraft/setup_aclauncher
Executable file
|
@ -0,0 +1,22 @@
|
|||
#!/bin/bash
|
||||
|
||||
rm -rf ~/.aclauncher
|
||||
mkdir ~/.aclauncher
|
||||
|
||||
mkdir ~/.aclauncher/bin
|
||||
pushd ACLauncher
|
||||
|
||||
./gradlew build
|
||||
|
||||
pushd packaging/linux
|
||||
|
||||
chmod +x build.sh
|
||||
./build.sh
|
||||
pushd out
|
||||
sudo dpkg -i ./aclauncher*.deb
|
||||
popd
|
||||
|
||||
popd
|
||||
|
||||
|
||||
popd
|
|
@ -11,14 +11,12 @@ pushd ATLauncher
|
|||
pushd packaging/linux
|
||||
|
||||
chmod +x build.sh
|
||||
sudo ./build.sh
|
||||
./build.sh
|
||||
pushd out
|
||||
sudo dpkg -i ./atlauncher*.deb
|
||||
popd
|
||||
|
||||
popd
|
||||
|
||||
USER=$(whoami)
|
||||
sudo chown -Rv $USER:$USER packaging
|
||||
|
||||
popd
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 56d9161ef8eefa9810f730e286d0e1ca60e9512a
|
||||
Subproject commit ec5cd26276c90e66725596f8a65747dba0c3258f
|
1
SecondLife/GameTables
Submodule
1
SecondLife/GameTables
Submodule
|
@ -0,0 +1 @@
|
|||
Subproject commit e4211846df55ca7136760edc90c1e6787baee3b6
|
|
@ -1 +1 @@
|
|||
Subproject commit f07ce2c64c202bffde4998379ee84a990248ccbd
|
||||
Subproject commit 81ca0a39dd5a595a72b020c5f6ca5a45dd3d0281
|
1
SecondLife/Sim-Status-Notifier
Submodule
1
SecondLife/Sim-Status-Notifier
Submodule
|
@ -0,0 +1 @@
|
|||
Subproject commit 0c06df5f9cf0b33100a4bbdb22df8f2070d52227
|
|
@ -1 +1 @@
|
|||
Subproject commit d70ee05983be2cc097592da227b3cdb79d1c98b3
|
||||
Subproject commit 9edcf196f12ec082fb8843d160e6ea5eb580b374
|
|
@ -1 +1 @@
|
|||
Subproject commit 7d016adc2e5413103824e2ebe47a8f22ed5ba966
|
||||
Subproject commit 8ea91aa0b4678a1d3233561ef701f473bca13b88
|
1
bashtop
Submodule
1
bashtop
Submodule
|
@ -0,0 +1 @@
|
|||
Subproject commit 60f95a1a74c8e7e589c02aa03d60141152df8337
|
Loading…
Reference in a new issue