Sync from development #2

Closed

LinusHuck wants to merge 0 commits from plate-llama-dawn/SkyBlock-Configs:active into development

pull from: plate-llama-dawn/SkyBlock-Configs:active

merge into: LinusHuck:development

LinusHuck:development

LinusHuck:rework-traveling

LinusHuck:0.0.5

LinusHuck:0.0.4

LinusHuck:0.0.3

LinusHuck:0.0.2

LinusHuck:0.0.0

Conversation 0 Commits - Files changed - +121 -6

LinusHuck commented 2025-11-16 11:49:25 +01:00

Owner

Copy link

No description provided.

LinusHuck added 88 commits 2025-11-16 11:49:26 +01:00

Merge pull request 'development' (#1) from LinusHuck/SkyBlock-Configs:development into active ... 4801609beb

Reviewed-on: http://37.120.191.134:20000/plate-llama-dawn/SkyBlock-Configs/pulls/1

Merge pull request 'Sync from development' (#3) from LinusHuck/SkyBlock-Configs:development into active 3158143ddc

Update base-config.yml 5c922c041d

Merge pull request 'Sync from development' (#4) from LinusHuck/SkyBlock-Configs:development into active 5fb6684163

Merge pull request 'Sync from development' (#5) from LinusHuck/SkyBlock-Configs:development into active c746f729e3

Update items/aspect_of_the_shatteredend.json 72c78cc53e

Update items/aspect_of_the_shatteredend.json d7f4d613c9

Update items/aspect_of_the_shatteredend.json eb4db29300

Test push d461c42cd0

Reformat replacements 033138dcad

revert 033138dcad ... 7ef0cae55b

revert Reformat replacements

Reformat replacements d03f0892cf

Merge remote-tracking branch 'origin/active' into active ... d5a1049f41

# Conflicts:
#	language/gui/collections/de.json
#	language/gui/collections/en.json
#	language/gui/recipes/de.json
#	language/gui/recipes/en.json
#	language/gui/skills/de.json
#	language/gui/skills/en.json
#	language/gui/trades/de.json
#	language/gui/trades/en.json
#	temp.json

Reformat replacements 509eb24459

Delete dasda.txt 4e4e407640

Add material support 342ac17709

Merge remote-tracking branch 'origin/development' into active ff740beb86

Add material support 1112c9a639

Add material support dfd8eb101d

Add material support 1d5b3c4ebb

Add material support 3dd442c1be

Fix head skins fe802045d2

Add langauge for teleport abilities fa1c3f79cb

Add other items ebb448aff2

Fix replacement for abilities 7435761f06

Add language/stats/en.json ed18b91444

Add ability stats d6c421b350

Add ability stats 75a4deb7eb

Delete language/stats/en.json db54ed1481

Add language/stat/en.json 0dd1d1babb

Add language/stats/en.json ec61cbe352

Delete language/stat/en.json c92ea2035c

Add rarity 80f52ab999

Merge remote-tracking branch 'origin/active' into active f6119bab1b

Update language/rarity/de.json c309eae3d5

Add language/stats/de.json dcde770759

Update language/item/aspect_of_the_shatteredend/de.json 3e44f09fd2

Update language/item/aspect_of_the_shatteredend/en.json 88e58a3cd9

Update language/abilities/teleport_8_0/de.json cf6d9a396f

Update language/abilities/tree_capitator/de.json 9e36959d8f

Update language/abilities/teleport_8_50/de.json 6ac7c7ab0d

Update language/abilities/teleport_8_40/de.json 14dcc58268

Update language/abilities/stats/de.json adcc44d707

Update language/abilities/jungle_axe/de.json 3da95a7d8d

Update language/abilities/grappling_hook/de.json 5766d3cdfb

Update language/general/de.json 1be3ffeba3

Update language/abilities/grappling_hook/en.json 375152614b

Update language/abilities/grappling_hook/de.json cf26f9dece

Update language/abilities/jungle_axe/de.json 01fd525c7f

Update language/abilities/jungle_axe/en.json db5b904b15

Update language/abilities/teleport_8_0/de.json b1ca9ad5ea

Update language/abilities/teleport_8_0/en.json e0c345ce42

Update language/abilities/teleport_8_40/en.json 8548886713

Update language/abilities/teleport_8_40/de.json 914a8c8b1b

Update language/abilities/teleport_8_50/de.json adb6b1ba33

Update language/abilities/teleport_8_50/en.json 6d46626bad

Update language/abilities/tree_capitator/de.json e63718e826

Update language/abilities/tree_capitator/en.json 37a5119180

Delete minions/en.json 31aa912fc3

Fix grappling_hook.json 266ac9e2a7

Convert <replacement:text> to %text% for minion messages 67a6bf17e4

Add minion rarity a5eef250c7

Add minion rarity e70d7734c7

Add upgrades and fuels d7aef25a6d

Add minionskins/grinch.json 03890313d8

Add minionskins/snowman.json b67828e2e2

fix language aa2f82d1d4

Add items/grinch.json cc98678b14

Delete minionskins/grinch.json ae2c75ade6

Add items/snowman.json 45bb9cbfca

Delete minionskins/snowman.json 241fca4cca

Change super_compactor_3000.json to super_compactor160.json 5884ab7474

Fix some gui materials 81322d9adb

Add ProfileGUI.yaml materials db086d3c67

Add gui/menu/skill/SkillGUI0.yaml a81d81f9fd

Delete gui/menu/SkillGUI1.yaml 77dcd0591e

Delete gui/menu/SkillGUI0.yaml 5974c15d9e

Add gui/menu/skill/SkillGUI1.yaml 688d5242e4

Update gui/menu/skill/SkillGUI0.yaml 6e047a7997

Add gui/menu/skill/items.yaml 6445f2c1af

Update gui/menu/skill/items.yaml 72cc96c830

Update skyblockskillsandmaterials.json 55fdccb1ec

Update gui/menu/skill/SkillGUI0.yaml fbb8c8bad6

Add gui/menu/collection/ items.yaml cc84d5f259

Update skyblockskillsandmaterials.json 1ea884e1a2

Update gui/menu/collection/ items.yaml 71aaa13038

Update gui/menu/collection/ items.yaml 5768e2d6a1

Remove space 1b78dc3377

LinusHuck added 1 commit 2025-11-16 13:07:03 +01:00

Merge pull request 'Sync from development' (#7) from LinusHuck/SkyBlock-Configs:development into active 753e490ae1

LinusHuck added 1 commit 2025-11-16 13:07:24 +01:00

Update base-config.yml 18832de365

LinusHuck added 1 commit 2025-11-16 13:16:36 +01:00

Merge pull request 'Sync from development' (#8) from LinusHuck/SkyBlock-Configs:development into active e5d4b221d1

LinusHuck added 1 commit 2025-11-16 13:37:16 +01:00

Merge pull request 'Sync from development' (#9) from LinusHuck/SkyBlock-Configs:development into active 68ccfc1a15

LinusHuck added 1 commit 2025-12-03 16:18:46 +01:00

Merge pull request 'Sync from development' (#10) from LinusHuck/SkyBlock-Configs:development into active 3092cc6424

Teixayo added 1 commit 2025-12-03 16:42:16 +01:00

Add profiles/SkyBlockProfileFruit.java b9fed15e0f

Teixayo added 1 commit 2025-12-03 16:43:27 +01:00

Update profiles/SkyBlockProfileFruit.java f8dd5f14ae

Teixayo added 1 commit 2025-12-03 17:03:45 +01:00

Delete profiles/SkyBlockProfileFruit.java 31fce82a23

Teixayo added 1 commit 2025-12-03 17:05:36 +01:00

Add fruits.json 2e07ae3cfd

Teixayo added 1 commit 2025-12-03 17:06:35 +01:00

Add fruits.json 6d7006fe31

Teixayo added 1 commit 2025-12-03 17:16:15 +01:00

Change name ace18aa99b

Teixayo added 1 commit 2025-12-05 12:55:42 +01:00

Add SettingsGUI.yaml d266573dfe

Teixayo added 1 commit 2025-12-05 19:42:28 +01:00

Add user interface + personal gui/language 4f4868c9a7

Teixayo added 1 commit 2025-12-06 08:42:49 +01:00

Fix some settings issues 74b4162c50

Teixayo added 1 commit 2025-12-06 09:02:59 +01:00

Add language skins 598aeeb214

Teixayo added 2 commits 2025-12-06 09:52:23 +01:00

Add language skins 27f89cce82

Fix small issues f6fe13248c

Teixayo added 1 commit 2025-12-06 10:09:14 +01:00

Add enable/disable message 9ddb80f37d

Teixayo added 1 commit 2025-12-06 11:51:10 +01:00

Add LanguageGUI ad17d60648

Teixayo added 1 commit 2025-12-06 15:38:48 +01:00

Add enable/disable message e77883ee2f

Teixayo added 1 commit 2025-12-06 15:42:43 +01:00

Add enable/disable message d0cb2b3fd8

Teixayo added 1 commit 2025-12-06 15:53:46 +01:00

Remove close for settings language gui 32464fb16d

LinusHuck closed this pull request 2025-12-08 12:03:24 +01:00

Pull request closed

Please reopen this pull request to perform a merge.

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

LinusHuck/SkyBlock-Configs!2

No description provided.