Skip to content

Commit

Permalink
Merge branch 'base' into battle
Browse files Browse the repository at this point in the history
  • Loading branch information
DBTDerpbox committed Jun 3, 2024
2 parents 9709056 + 843c4b2 commit 49be734
Show file tree
Hide file tree
Showing 2 changed files with 230 additions and 30 deletions.
18 changes: 8 additions & 10 deletions .github/workflows/autoHash.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
# Automatically build the project and run any configured tests for every push
# and submitted pull request. This can help catch issues that only occur on
# certain platforms or Java versions, and provides a first line of defence
# against bad commits.

name: AutoHash
on: [push]

Expand All @@ -22,17 +17,20 @@ jobs:
distribution: 'temurin' # See 'Supported distributions' for available options
java-version: '17'

- name: Download AutoHasher
working-directory: ./.toolbox
run: curl -O https://raw.githubusercontent.com/Legacy-Edition-Minigames/ToolBox/java/testConfigs/AutoHasher.jar
- uses: robinraju/[email protected]
with:
repository: 'Legacy-Edition-Minigames/ToolBox'
latest: true
fileName: 'Toolbox2.0_noupdater.jar'
out-file-path: '.toolbox'

- name: Hash Files
working-directory: ./.toolbox
run: java -jar AutoHasher.jar --autoHash
run: java -jar Toolbox2.0_noupdater.jar --autoHash

- name: Delete AutoHasher
working-directory: ./.toolbox
run: rm AutoHasher.jar
run: rm Toolbox2.0_noupdater.jar

- name: Push changes
uses: stefanzweifel/git-auto-commit-action@v5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,18 +79,10 @@ execute as 559a3359-aab0-4703-9590-f96d7851cddc run scoreboard players set @s le
execute as e234fdf0-b813-4fab-b609-655a56f91237 run scoreboard players set @s lem.patreon 2
#WaffleHoney43
execute as fa012ca4-25a8-4e36-b4bf-75236f27bbd2 run scoreboard players set @s lem.patreon 1
#Dr_01000111
execute as af419e84-c3e9-44ed-8dc2-de7527163aa1 run scoreboard players set @s lem.patreon 2
#sunjahmen
execute as bb9087e8-f2b5-47b0-9bb2-8da22fe125d9 run scoreboard players set @s lem.patreon 1
#TorchReaper
execute as 9702cc0a-b031-4e51-93e4-192198a473b1 run scoreboard players set @s lem.patreon 1
#AustinDLM
execute as af3b5352-d5b2-4dd3-aabb-6d6b9b1ff1d9 run scoreboard players set @s lem.patreon 1
#__yan
execute as feab43ec-0215-481c-a903-5610cdf703b3 run scoreboard players set @s lem.patreon 1
#TheMikeGuy_
execute as ea05cc4d-d07c-4d4d-ae51-1ab7abbbfb42 run scoreboard players set @s lem.patreon 1
#Hecker_01
execute as 3530addd-a11a-4834-8684-0b10bdb958d7 run scoreboard players set @s lem.patreon 1
#CuddleDrivenPony
Expand All @@ -99,24 +91,234 @@ execute as ea149491-22e9-4458-b52e-ddd3f66e6d92 run scoreboard players set @s le
execute as 10238b23-d519-4223-87e9-5182bf0bc5ec run scoreboard players set @s lem.patreon 1
#CrumbledHam
execute as 1248d4e7-23eb-4605-ad21-dadcc8b2c965 run scoreboard players set @s lem.patreon 2
#UnfortunateGms
execute as 61b571b3-973a-42ac-8e59-c29f19e87193 run scoreboard players set @s lem.patreon 1
#Kittygamer123456
execute as e145ae1a-2334-47f1-9026-7ea6def268af run scoreboard players set @s lem.patreon 1
#RogueRyan_
execute as 9542dee5-c116-4dbc-879d-1c211fee4cb6 run scoreboard players set @s lem.patreon 1
#SThreeQ
execute as d78b906a-4ad5-4af3-814b-42d20f2e90b8 run scoreboard players set @s lem.patreon 5
#BigManJude8
execute as 50fd53fb-7000-4cf2-b980-c150b223fe9e run scoreboard players set @s lem.patreon 1
#KookieMonsT3Rz
execute as 366f29a9-ef78-454c-b841-be9b8430e7be run scoreboard players set @s lem.patreon 1
#fan1glam
execute as e345a768-2b7b-4b07-9d7b-3d88c00c4af2 run scoreboard players set @s lem.patreon 1
#Crewface28
execute as 7f66c430-e6ee-4666-a22e-d03e31913b32 run scoreboard players set @s lem.patreon 1
#RottenFlesh_
execute as fc1c5251-d348-4ce7-8782-e1711c1b16e8 run scoreboard players set @s lem.patreon 1
#KittyWulffie
execute as d5b3afe1-250b-4a67-a791-3fdbf250ff18 run scoreboard players set @s lem.patreon 1
#ClassicSTH
execute as 9c69669b-aa84-4870-a514-1c35dc0a730f run scoreboard players set @s lem.patreon 1
#jackundiez1878
execute as c1eb3953-efd9-484b-97b1-0d366da10b60 run scoreboard players set @s lem.patreon 1
#Mastersteve11
execute as 85bd1323-d8e0-42df-8367-4766fd910882 run scoreboard players set @s lem.patreon 1
#T3CH_03
execute as 8025aec9-4585-41ad-95ac-0456592234a8 run scoreboard players set @s lem.patreon 1
#That1Shroom
execute as 102a1858-50e9-4f58-a465-40d4d6f2e3d6 run scoreboard players set @s lem.patreon 3
#SirWaffly
execute as 3d9906b2-219e-4597-858f-b750aa1241a1 run scoreboard players set @s lem.patreon 1
#Goon1170
execute as fb036e88-e49a-4cc5-88a9-c38d35811dae run scoreboard players set @s lem.patreon 1
#Ezren_
execute as 63ebb9f2-9546-46ca-9cc8-3efa19c504f5 run scoreboard players set @s lem.patreon 1
#H4med
execute as 35245af8-bb9c-4aff-a2c0-eb862f45fbba run scoreboard players set @s lem.patreon 1
#XBLGodling
execute as 65f22cfc-a3cd-49ac-8496-24f8ca3fcfeb run scoreboard players set @s lem.patreon 1
#well3
execute as dbfbb61f-98e8-466d-a706-81fb1aa9aa66 run scoreboard players set @s lem.patreon 1
#Colmas831
execute as 861220d7-5ccb-44f1-8553-7436c278e5f0 run scoreboard players set @s lem.patreon 1
#Motschen
execute as a44c2660-630f-478f-946a-e518669fcf0c run scoreboard players set @s lem.patreon 3
#Hey_ItsAdam
execute as 02665e5c-c1a4-448d-9c5b-fbce24c50487 run scoreboard players set @s lem.patreon 1
#Groompski
execute as 8ab955fe-e893-464e-a076-ec225a1137ba run scoreboard players set @s lem.patreon 1
#Crakk
execute as 994d4285-f6b7-4b5f-93a1-f93d3421a8e1 run scoreboard players set @s lem.patreon 1
#TimLikesWaffles
execute as 3d40a179-65cc-4cb8-b4f6-5abc43c30af3 run scoreboard players set @s lem.patreon 1
#crazyappleguy7
execute as 24f6f475-b27e-44e4-9bad-8fe3f538b79a run scoreboard players set @s lem.patreon 1
#Jaded_d
execute as 4577704b-302e-4e76-9597-ccf7d7ef3654 run scoreboard players set @s lem.patreon 1
#axob
execute as 37850395-3fa1-4f1f-bc61-b92fcb6825d6 run scoreboard players set @s lem.patreon 1
#QuitePeeved
execute as 98946c52-00e2-4d35-9d85-f045fe2c902b run scoreboard players set @s lem.patreon 1
#Vectrix
execute as c00ae8aa-499e-418c-b31f-c8cde4dec384 run scoreboard players set @s lem.patreon 1
#qTutu
execute as 963b104c-e89e-4bfb-b4de-94a6504295d1 run scoreboard players set @s lem.patreon 1
#Monster2239
execute as 0590e453-1215-4852-a173-02f940f57f02 run scoreboard players set @s lem.patreon 1
#iuky
execute as b16d9b81-7f2d-4b27-a0b1-6b2c2f125979 run scoreboard players set @s lem.patreon 1
#BossGamerBrent
execute as 8c193d5d-ada0-49b5-8446-981a143e87f9 run scoreboard players set @s lem.patreon 1
#scooter_waffle
execute as c59afcde-4c04-46cb-9149-6948a00cd776 run scoreboard players set @s lem.patreon 2
#JoeyCheerio
execute as 287d92d6-8ddc-4d28-bd2e-4cd224da15b6 run scoreboard players set @s lem.patreon 1
#Ignition0001
execute as 6f3b0b1b-ca35-43ad-8ffe-105d8002c6ec run scoreboard players set @s lem.patreon 1
#M1n1k3m0n
execute as 4ede9a53-be4a-45ae-a7cf-2754b8079a54 run scoreboard players set @s lem.patreon 1
#Fax_Machin
execute as 52cf66c8-d95f-4440-9366-8568eb7e5000 run scoreboard players set @s lem.patreon 5
#DroCaleb
execute as 1b20016a-0198-44f0-8641-8cf8512ae280 run scoreboard players set @s lem.patreon 2
#Sorroh
execute as a21a6290-896b-43bb-8b0a-046869cdfa20 run scoreboard players set @s lem.patreon 1
#LonkBTS
execute as e0017f2a-18af-4a85-9f20-3e61e80558f0 run scoreboard players set @s lem.patreon 1
#tabby0x
execute as b917b2dc-c0d3-40e6-abc0-931f237ba158 run scoreboard players set @s lem.patreon 1
#Sebushtin
execute as eb746546-4e82-4271-9ac5-ed6460a4d897 run scoreboard players set @s lem.patreon 1
#Hardly_Meow
execute as 3360a7df-1563-4bd2-aa80-ea993333a502 run scoreboard players set @s lem.patreon 1
#MinetestSore12
execute as 27ce6244-74e8-47ec-b451-4773e98bf691 run scoreboard players set @s lem.patreon 1
#Kren58
execute as b05817e0-d55a-4ff8-844e-ae11bf79ee16 run scoreboard players set @s lem.patreon 1
#HardlyMeow
execute as 51f1605e-9ebe-4686-ac9b-fd93baa4a30b run scoreboard players set @s lem.patreon 1
#Poloneck
execute as 65bd1869-ddfd-467e-b7f4-54ce9099320b run scoreboard players set @s lem.patreon 1
#_fry__
execute as c4d12f58-b620-4e22-abf4-aebf32467877 run scoreboard players set @s lem.patreon 1
#bigdaddy2
execute as 993e9c70-43e8-471c-a7e3-d3fb649bab66 run scoreboard players set @s lem.patreon 1
#r5T6y_
execute as e2d86707-2cea-439f-8fd9-bc04805fe59b run scoreboard players set @s lem.patreon 1
#Undergamer13
execute as b155030a-8de0-4089-9ad8-3709c0827885 run scoreboard players set @s lem.patreon 1
#Iamkiller_
execute as 474df513-421f-4eaa-96ff-35a6c3a13028 run scoreboard players set @s lem.patreon 1
#NoNormalOne
execute as 5120541a-0d36-4add-8849-5d5e79d6aef6 run scoreboard players set @s lem.patreon 1
#XG_S
execute as 5c68e83a-94b2-4ad0-b1bc-3e6defefa667 run scoreboard players set @s lem.patreon 1
#Fax_Machin - tier 5
execute as 52cf66c8-d95f-4440-9366-8568eb7e5000 run scoreboard players set @s lem.patreon 5
#CallMeAvery907
execute as 6504df20-4824-4cf3-8f15-72e04dd386c7 run scoreboard players set @s lem.patreon 1
#W1IL
execute as 04103ecf-1bdf-4a67-862a-d91850c5eb0b run scoreboard players set @s lem.patreon 1
#ResistVR
execute as 968e037f-7249-4bca-9ea5-4d1fb601b88f run scoreboard players set @s lem.patreon 1
#CatgirlMythic
execute as 08e84251-f799-4a7c-a0bc-61aa92b7b053 run scoreboard players set @s lem.patreon 1
#2Twon95 - tier 2
execute as e2a6807e-1277-4bb3-aafe-c0595c40aea8 run scoreboard players set @s lem.patreon 2
#NotRagerZ
execute as 517f460a-c053-4d4b-a6f3-4979c5d73728 run scoreboard players set @s lem.patreon 1
#KaidenArt
execute as 34e8964f-2cdc-4254-999c-f77c01f0b49b run scoreboard players set @s lem.patreon 1
#generalHenryC
execute as 625f40c4-5b43-400a-9bd0-8c8657531d79 run scoreboard players set @s lem.patreon 1
#GodricGryffindor
execute as e1ce052e-cb47-4b7b-a706-ade5196724c0 run scoreboard players set @s lem.patreon 1
#vElexro
execute as 2b32abf6-18fb-48d1-80ea-a56c97592fe3 run scoreboard players set @s lem.patreon 1
#bananatz
execute as 4a3b6281-f58a-4985-95a5-b3d8e370962e run scoreboard players set @s lem.patreon 1
#Fashie_
execute as f939467a-81ce-40ea-9939-4a2499461ef2 run scoreboard players set @s lem.patreon 1
#AustinAndGamerz
execute as 30004162-94a3-4829-b36c-4525778e8ede run scoreboard players set @s lem.patreon 1
#LowkyFi
execute as 6abacfe2-2015-4374-9adb-8e6898377dff run scoreboard players set @s lem.patreon 1
#Ifdcra
execute as 282e60e9-bc1b-46aa-a628-3fd0d57721d8 run scoreboard players set @s lem.patreon 1
#notyuru
execute as fa116ca3-731e-42e9-94f6-fa40e88b3f9f run scoreboard players set @s lem.patreon 1
#HanaBananaCat
execute as 47669d38-2792-4b1d-92c4-9b6e0efeca0e run scoreboard players set @s lem.patreon 1
#Fire5818
execute as f6681f7b-f0d2-44f1-a8a3-f6ad148b69c3 run scoreboard players set @s lem.patreon 1
#gamerTM1234
execute as e2f84393-50d7-410b-98d4-0942a8621b11 run scoreboard players set @s lem.patreon 3
#IKnowJim
execute as 47917a66-a908-4383-94a3-e13bf6e77754 run scoreboard players set @s lem.patreon 1
#Mitbewohner
execute as fd85de83-5cb0-44b2-a08b-1a69db4b6977 run scoreboard players set @s lem.patreon 1
#DeceivedSloth99
execute as a34a4118-3a21-46bc-8476-00200d9e1992 run scoreboard players set @s lem.patreon 1
#BeatMC_
execute as 46c65aeb-90a6-454a-8f6e-b95f23842737 run scoreboard players set @s lem.patreon 1
#MrAngeloMc
execute as 93c830c1-4ed3-4ae8-91cd-ade1d82f1b9a run scoreboard players set @s lem.patreon 1
#Phineas1500
execute as c9ce74cb-c1c7-4de3-872b-da0119e2bfdd run scoreboard players set @s lem.patreon 1
#MyBadImNotBad
execute as 14fc9045-fe84-4a04-af38-45181de0b4e8 run scoreboard players set @s lem.patreon 1
#cooperw2
execute as 87097e22-18ef-40c7-8f2e-9d3cb1c5e4c1 run scoreboard players set @s lem.patreon 1
#Pandaril
execute as b9c950aa-e392-4730-9939-5bcab0565ace run scoreboard players set @s lem.patreon 1
#t6amygdala
execute as b29a7646-d091-4936-bae3-9ab17ec7c17d run scoreboard players set @s lem.patreon 1
#2000gb
execute as c7f2f368-e1fb-4e5e-bbe3-5d6d37cb7715 run scoreboard players set @s lem.patreon 1
#PackedJungle
execute as dd08382e-e3ea-4500-a898-ab8b1cbff9a5 run scoreboard players set @s lem.patreon 1
#Feranogame
execute as d47d8641-75ae-407a-96bf-658b248630ff run scoreboard players set @s lem.patreon 1
#rapntrin
execute as c14fccd7-d5f9-45ef-b27e-21c9ab4c0d01 run scoreboard players set @s lem.patreon 1
#Limitens
execute as a77815ce-e95a-43c2-a23f-cdb4bc6f3eb6 run scoreboard players set @s lem.patreon 1
#uberdrqgon_
execute as a24f22f6-b105-4e14-a22b-8ea1dc8d814e run scoreboard players set @s lem.patreon 1
#981_
execute as dfe54f93-c533-4d01-957f-f13e91bd966d run scoreboard players set @s lem.patreon 1
#worstending
execute as 113f4188-8816-42e9-870b-d2e67510b8de run scoreboard players set @s lem.patreon 1
#JomarD30
execute as 1706f7d0-246b-4e07-bd64-1f3bda928bc9 run scoreboard players set @s lem.patreon 1
#TheBotiestBot420
execute as 92661b86-12da-47e8-b053-73aec913df13 run scoreboard players set @s lem.patreon 1
#gyrs
execute as 76a63feb-019d-4057-863a-4247479f6499 run scoreboard players set @s lem.patreon 1
#ZonArtistica64
execute as ba829ecf-e349-477b-a8b7-2b62508751de run scoreboard players set @s lem.patreon 1
#Mrgaagaaa
execute as 075e24d5-b851-4060-a7f6-cadbbfafb6b6 run scoreboard players set @s lem.patreon 1
#WybieJr
execute as 25cb8998-9f76-461d-a4cd-2aab2e5ebccd run scoreboard players set @s lem.patreon 2
#PobloEscobar
execute as 104ca7f5-cea8-4e70-a417-92b50ccdb2c2 run scoreboard players set @s lem.patreon 1
#ProfessChickonYT
execute as b53071e3-de4e-4612-bcc4-8bf911dd720a run scoreboard players set @s lem.patreon 1
#Mr_Masker16
execute as 04e0593f-4ced-4ba1-a985-1e55d21801ac run scoreboard players set @s lem.patreon 1
#Peasanthings
execute as 941e8ed4-5e12-4c6a-a4ef-1004f4cde2b5 run scoreboard players set @s lem.patreon 5
#Eagletanker
execute as a9661f44-ce0e-4c91-b5bd-51e8d04465c0 run scoreboard players set @s lem.patreon 1
#swiftzyr
execute as 3ff67346-7c70-4d37-906d-3de004300e4a run scoreboard players set @s lem.patreon 1
#Toris_
execute as 85f4a69d-6aa1-4673-a64b-097e282f4859 run scoreboard players set @s lem.patreon 1
#VoxelFloof
execute as b7a964ec-df0d-46eb-809a-8a6257a2ab90 run scoreboard players set @s lem.patreon 1
#Awes0mePanda23
execute as 1b6f4e74-cff2-4e9f-a46a-3faf28fab1cc run scoreboard players set @s lem.patreon 1
#CryojesterRX
execute as 7d100931-f679-49f5-941e-4e1140fed092 run scoreboard players set @s lem.patreon 5
#onlyjordon
execute as 58ade92f-c1b5-49fe-a942-65efb712425a run scoreboard players set @s lem.patreon 1
#Sano_mc
execute as b67379d2-cd2b-4a6b-aeee-bbb9332cf7ec run scoreboard players set @s lem.patreon 1
#GriffBMo
execute as af1a3cae-f78e-475a-9794-b90fb2205e4b run scoreboard players set @s lem.patreon 2
#pixelatedname
execute as 817ff77d-4bf0-4bac-9d81-c387e3b24f29 run scoreboard players set @s lem.patreon 1
#ImAmGay
execute as ae101574-e132-439b-88d2-9e64c6ec1546 run scoreboard players set @s lem.patreon 1
#hzDelta
execute as 37f2fcb4-a4db-46ad-8ca4-1c2737d0c6df run scoreboard players set @s lem.patreon 1
#DirefulCactus
execute as 3a3d42ed-e5a4-491f-843b-5b631825d887 run scoreboard players set @s lem.patreon 1
#Kiyoshime
execute as 1b481fff-6b14-49f4-86a6-65d579d19f94 run scoreboard players set @s lem.patreon 1

##Reset heart if no longer subscribed
#Tiny
Expand Down

0 comments on commit 49be734

Please sign in to comment.