Merge

2025-07-07 15:59:13 +07:00 · 2025-07-07 15:59:13 +07:00 · a020f80ae0
commit a020f80ae0
parent 6660fd5675 ca7ef56a10
417 changed files with 157584 additions and 52899 deletions
--- a/image/new_vending_info/unlock_elock.png
+++ b/image/new_vending_info/unlock_elock.png
--- a/inc/remove_cup_tag_on_arm.inc
+++ b/inc/remove_cup_tag_on_arm.inc
@ -23,9 +23,9 @@
 		Var buttonRemoveCupOnArm = "Invisible"
 	Else
 		Var buttonRemoveCupOnArm = "Enable"
-		
-	EindIf
+
+	EndIf
 	Refresh
-	
+
 </EventDrink>

--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_CHOCOLATE_MILK.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_CHOCOLATE_MILK.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_JASMINE_MILK_TEA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_JASMINE_MILK_TEA.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MATCHA_LATTE.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MATCHA_LATTE.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MILK.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_MILK.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_PEPSI.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_PEPSI.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SODA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_SODA.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_BLACK_TEA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_BLACK_TEA.png
--- a/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_MILK_TEA.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_COCONUT_THAI_MILK_TEA.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_ChocoYuzu_milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_ChocoYuzu_milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Melon_smoothie.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Melon_smoothie.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Mint_Matcha_Latte.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Mint_Matcha_Latte.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Mint_Milk_Biscoff.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Mint_Milk_Biscoff.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Mint_Milk_Straw.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Mint_Milk_Straw.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Mint_Milk_Straw_Biscoff.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Mint_Milk_Straw_Biscoff.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Mint_Yuzu_Soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Mint_Yuzu_Soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Mint_pepsi.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Mint_pepsi.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Sparkling_Coconut_Lychee.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Sparkling_Coconut_Lychee.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Sparkling_Lychee_Limenade.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Sparkling_Lychee_Limenade.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Sparkling_Lychee_and_Mint.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Sparkling_Lychee_and_Mint.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Sparkling_Starwberry_and_Mint.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Sparkling_Starwberry_and_Mint.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Strawberry_Chessecake_Elegance_Staw_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_COCONUT_MATCHA_LATTE.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_COCONUT_MATCHA_LATTE.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_milk_tea.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_milk_tea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_milk_tea_sing.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_milk_tea_sing.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_tea.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_tea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_tea_sing.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_matcha_tea_sing.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_milk_Vanilla.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_milk_Vanilla.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_mint_milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_mint_milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Caramel_mocha.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Caramel_mocha.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Vanilla_caramel_Milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Vanilla_caramel_Milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Vanilla_cocoa.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Vanilla_cocoa.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_caramel.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_caramel.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_cocoa.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_cocoa.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Caramel_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Caramel_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Coconut_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Coconut_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Lychee_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Lychee_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Strawberry_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Strawberry_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Vanilla_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Vanilla_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Yuzu_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Yuzu_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_lemonade_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_lemonade_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_melon_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_melon_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_pepsi_Black.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_pepsi_Black.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_pepsi_Black_MELON.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_pepsi_Black_MELON.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_pepsi_yuzu.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_pepsi_yuzu.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_strawberry_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_strawberry_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_strawberrycocoa_smoothie.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_strawberrymilk_smoothie.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_yuzu_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_yuzu_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_yuzu_soda_hug_in_a_cup.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_yuzu_soda_hug_in_a_cup.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_Chocolate.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_Chocolate.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_Matcha.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_Matcha.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_Mocha.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_Mocha.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_Strawberry.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_Strawberry.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_Thaitea.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_Thaitea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_caramel.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_caramel.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_espresso.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_espresso.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_isolated.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_isolated.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_melon.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_melon.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_milk.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_milk.png
--- a/inter/aus/image/page_drink_disable_n2/bn_smoothie_oreo.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_smoothie_oreo.png
--- a/inter/aus/image/page_drink_disable_n2/bn_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_soda.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_CHOCOLATE_MILK.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_CHOCOLATE_MILK.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_JASMINE_MILK_TEA.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_JASMINE_MILK_TEA.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_MATCHA_LATTE.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_MATCHA_LATTE.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_MILK.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_MILK.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_PEPSI.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_PEPSI.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_SODA.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_SODA.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_THAI_BLACK_TEA.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_THAI_BLACK_TEA.png
--- a/inter/aus/image/page_drink_n/bn_COCONUT_THAI_MILK_TEA.png
+++ b/inter/aus/image/page_drink_n/bn_COCONUT_THAI_MILK_TEA.png
--- a/inter/aus/image/page_drink_n/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_n/bn_Caramel_Cheesecake_Splendor_Caramel_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_n/bn_ChocoYuzu_milk.png
+++ b/inter/aus/image/page_drink_n/bn_ChocoYuzu_milk.png
--- a/inter/aus/image/page_drink_n/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_n/bn_Creamy_Chessecake_frapee_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_n/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_n/bn_Lychee_Cheesecake_Majesty_Lychee_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_n/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_n/bn_Melon_Cheesecake_Sonata_Melonl_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_n/bn_Melon_smoothie.png
+++ b/inter/aus/image/page_drink_n/bn_Melon_smoothie.png
--- a/inter/aus/image/page_drink_n/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png
+++ b/inter/aus/image/page_drink_n/bn_Mint_Cheesecake_Symphony_Mint_yuzu_Vanilla_Milk.png
--- a/inter/aus/image/page_drink_n/bn_Mint_Matcha_Latte.png
+++ b/inter/aus/image/page_drink_n/bn_Mint_Matcha_Latte.png
--- a/inter/aus/image/page_drink_n/bn_Mint_Milk_Biscoff.png
+++ b/inter/aus/image/page_drink_n/bn_Mint_Milk_Biscoff.png
--- a/inter/aus/image/page_drink_n/bn_Mint_Milk_Straw.png
+++ b/inter/aus/image/page_drink_n/bn_Mint_Milk_Straw.png
--- a/inter/aus/image/page_drink_n/bn_Mint_Milk_Straw_Biscoff.png
+++ b/inter/aus/image/page_drink_n/bn_Mint_Milk_Straw_Biscoff.png
--- a/inter/aus/image/page_drink_n/bn_Mint_Yuzu_Soda.png
+++ b/inter/aus/image/page_drink_n/bn_Mint_Yuzu_Soda.png
--- a/inter/aus/image/page_drink_n/bn_Mint_pepsi.png
+++ b/inter/aus/image/page_drink_n/bn_Mint_pepsi.png
--- a/inter/aus/image/page_drink_n/bn_Sparkling_Coconut_Lychee.png
+++ b/inter/aus/image/page_drink_n/bn_Sparkling_Coconut_Lychee.png
--- a/inter/aus/image/page_drink_n/bn_Sparkling_Lychee_Limenade.png
+++ b/inter/aus/image/page_drink_n/bn_Sparkling_Lychee_Limenade.png
--- a/inter/aus/image/page_drink_n/bn_Sparkling_Lychee_and_Mint.png
+++ b/inter/aus/image/page_drink_n/bn_Sparkling_Lychee_and_Mint.png
--- a/Show more
+++ b/Show more