Rework Drink/Food/FoodContainer entirely (#1009)

Browse Source

Co-authored-by: FL-OZ <anotherscuffed@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>

...

This commit is contained in:

FL-OZ

2020-05-29 15:50:23 -05:00

committed by GitHub

parent 7222b6d8e2

commit aa26bdfcae

107 changed files with 946 additions and 1099 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

Resources/Textures/Objects/DrinkFoodContainers/apple_cake.rsi/icon.png → Resources/Textures/Objects/FoodContainers/apple_cake.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 945 B After Width:  |  Height:  |  Size: 945 B

0

Resources/Textures/Objects/DrinkFoodContainers/apple_cake.rsi/meta.json → Resources/Textures/Objects/FoodContainers/apple_cake.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/bananabread.rsi/icon.png → Resources/Textures/Objects/FoodContainers/bananabread.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 767 B After Width:  |  Height:  |  Size: 767 B

0

Resources/Textures/Objects/DrinkFoodContainers/bananabread.rsi/meta.json → Resources/Textures/Objects/FoodContainers/bananabread.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/birthdaycake.rsi/icon.png → Resources/Textures/Objects/FoodContainers/birthdaycake.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 668 B After Width:  |  Height:  |  Size: 668 B

0

Resources/Textures/Objects/DrinkFoodContainers/birthdaycake.rsi/meta.json → Resources/Textures/Objects/FoodContainers/birthdaycake.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/braincake.rsi/icon.png → Resources/Textures/Objects/FoodContainers/braincake.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.3 KiB After Width:  |  Height:  |  Size: 1.3 KiB

0

Resources/Textures/Objects/DrinkFoodContainers/braincake.rsi/meta.json → Resources/Textures/Objects/FoodContainers/braincake.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/bread.rsi/icon.png → Resources/Textures/Objects/FoodContainers/bread.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 736 B After Width:  |  Height:  |  Size: 736 B

0

Resources/Textures/Objects/DrinkFoodContainers/bread.rsi/meta.json → Resources/Textures/Objects/FoodContainers/bread.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/carrotcake.rsi/icon.png → Resources/Textures/Objects/FoodContainers/carrotcake.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 919 B After Width:  |  Height:  |  Size: 919 B

0

Resources/Textures/Objects/DrinkFoodContainers/carrotcake.rsi/meta.json → Resources/Textures/Objects/FoodContainers/carrotcake.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/cheesecake.rsi/icon.png → Resources/Textures/Objects/FoodContainers/cheesecake.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 904 B After Width:  |  Height:  |  Size: 904 B

0

Resources/Textures/Objects/DrinkFoodContainers/cheesecake.rsi/meta.json → Resources/Textures/Objects/FoodContainers/cheesecake.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/cheesewheel.rsi/icon.png → Resources/Textures/Objects/FoodContainers/cheesewheel.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 646 B After Width:  |  Height:  |  Size: 646 B

0

Resources/Textures/Objects/DrinkFoodContainers/cheesewheel.rsi/meta.json → Resources/Textures/Objects/FoodContainers/cheesewheel.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/chocolatecake.rsi/icon.png → Resources/Textures/Objects/FoodContainers/chocolatecake.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 755 B After Width:  |  Height:  |  Size: 755 B

0

Resources/Textures/Objects/DrinkFoodContainers/chocolatecake.rsi/meta.json → Resources/Textures/Objects/FoodContainers/chocolatecake.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/creamcheesebread.rsi/icon.png → Resources/Textures/Objects/FoodContainers/creamcheesebread.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 917 B After Width:  |  Height:  |  Size: 917 B

0

Resources/Textures/Objects/DrinkFoodContainers/creamcheesebread.rsi/meta.json → Resources/Textures/Objects/FoodContainers/creamcheesebread.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/donutbox.rsi/donutbox-0.png → Resources/Textures/Objects/FoodContainers/donutbox.rsi/donutbox-0.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 356 B After Width:  |  Height:  |  Size: 356 B

0

Resources/Textures/Objects/DrinkFoodContainers/donutbox.rsi/donutbox-1.png → Resources/Textures/Objects/FoodContainers/donutbox.rsi/donutbox-1.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.3 KiB After Width:  |  Height:  |  Size: 2.3 KiB

0

Resources/Textures/Objects/DrinkFoodContainers/donutbox.rsi/donutbox-2.png → Resources/Textures/Objects/FoodContainers/donutbox.rsi/donutbox-2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.5 KiB After Width:  |  Height:  |  Size: 2.5 KiB

0

Resources/Textures/Objects/DrinkFoodContainers/donutbox.rsi/donutbox-3.png → Resources/Textures/Objects/FoodContainers/donutbox.rsi/donutbox-3.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.6 KiB After Width:  |  Height:  |  Size: 2.6 KiB

0

Resources/Textures/Objects/DrinkFoodContainers/donutbox.rsi/donutbox-4.png → Resources/Textures/Objects/FoodContainers/donutbox.rsi/donutbox-4.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.7 KiB After Width:  |  Height:  |  Size: 2.7 KiB

0

Resources/Textures/Objects/DrinkFoodContainers/donutbox.rsi/donutbox-5.png → Resources/Textures/Objects/FoodContainers/donutbox.rsi/donutbox-5.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.8 KiB After Width:  |  Height:  |  Size: 2.8 KiB

0

Resources/Textures/Objects/DrinkFoodContainers/donutbox.rsi/donutbox-6.png → Resources/Textures/Objects/FoodContainers/donutbox.rsi/donutbox-6.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.9 KiB After Width:  |  Height:  |  Size: 2.9 KiB

0

Resources/Textures/Objects/DrinkFoodContainers/donutbox.rsi/icon.png → Resources/Textures/Objects/FoodContainers/donutbox.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 356 B After Width:  |  Height:  |  Size: 356 B

0

Resources/Textures/Objects/DrinkFoodContainers/donutbox.rsi/meta.json → Resources/Textures/Objects/FoodContainers/donutbox.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/eggbox.rsi/eggbox-0.png → Resources/Textures/Objects/FoodContainers/eggbox.rsi/eggbox-0.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 352 B After Width:  |  Height:  |  Size: 352 B

0

Resources/Textures/Objects/DrinkFoodContainers/eggbox.rsi/eggbox-1.png → Resources/Textures/Objects/FoodContainers/eggbox.rsi/eggbox-1.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 408 B After Width:  |  Height:  |  Size: 408 B

0

Resources/Textures/Objects/DrinkFoodContainers/eggbox.rsi/eggbox-10.png → Resources/Textures/Objects/FoodContainers/eggbox.rsi/eggbox-10.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 452 B After Width:  |  Height:  |  Size: 452 B

0

Resources/Textures/Objects/DrinkFoodContainers/eggbox.rsi/eggbox-11.png → Resources/Textures/Objects/FoodContainers/eggbox.rsi/eggbox-11.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 444 B After Width:  |  Height:  |  Size: 444 B

0

Resources/Textures/Objects/DrinkFoodContainers/eggbox.rsi/eggbox-12.png → Resources/Textures/Objects/FoodContainers/eggbox.rsi/eggbox-12.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 435 B After Width:  |  Height:  |  Size: 435 B

0

Resources/Textures/Objects/DrinkFoodContainers/eggbox.rsi/eggbox-2.png → Resources/Textures/Objects/FoodContainers/eggbox.rsi/eggbox-2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 410 B After Width:  |  Height:  |  Size: 410 B

0

Resources/Textures/Objects/DrinkFoodContainers/eggbox.rsi/eggbox-3.png → Resources/Textures/Objects/FoodContainers/eggbox.rsi/eggbox-3.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 413 B After Width:  |  Height:  |  Size: 413 B

0

Resources/Textures/Objects/DrinkFoodContainers/eggbox.rsi/eggbox-4.png → Resources/Textures/Objects/FoodContainers/eggbox.rsi/eggbox-4.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 442 B After Width:  |  Height:  |  Size: 442 B

0

Resources/Textures/Objects/DrinkFoodContainers/eggbox.rsi/eggbox-5.png → Resources/Textures/Objects/FoodContainers/eggbox.rsi/eggbox-5.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 437 B After Width:  |  Height:  |  Size: 437 B

0

Resources/Textures/Objects/DrinkFoodContainers/eggbox.rsi/eggbox-6.png → Resources/Textures/Objects/FoodContainers/eggbox.rsi/eggbox-6.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 429 B After Width:  |  Height:  |  Size: 429 B

0

Resources/Textures/Objects/DrinkFoodContainers/eggbox.rsi/eggbox-7.png → Resources/Textures/Objects/FoodContainers/eggbox.rsi/eggbox-7.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 461 B After Width:  |  Height:  |  Size: 461 B

0

Resources/Textures/Objects/DrinkFoodContainers/eggbox.rsi/eggbox-8.png → Resources/Textures/Objects/FoodContainers/eggbox.rsi/eggbox-8.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 462 B After Width:  |  Height:  |  Size: 462 B

0

Resources/Textures/Objects/DrinkFoodContainers/eggbox.rsi/eggbox-9.png → Resources/Textures/Objects/FoodContainers/eggbox.rsi/eggbox-9.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 461 B After Width:  |  Height:  |  Size: 461 B

0

Resources/Textures/Objects/DrinkFoodContainers/eggbox.rsi/meta.json → Resources/Textures/Objects/FoodContainers/eggbox.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/eggbox_shut.rsi/icon.png → Resources/Textures/Objects/FoodContainers/eggbox_shut.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 368 B After Width:  |  Height:  |  Size: 368 B

0

Resources/Textures/Objects/DrinkFoodContainers/eggbox_shut.rsi/meta.json → Resources/Textures/Objects/FoodContainers/eggbox_shut.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/lemoncake.rsi/icon.png → Resources/Textures/Objects/FoodContainers/lemoncake.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 923 B After Width:  |  Height:  |  Size: 923 B

0

Resources/Textures/Objects/DrinkFoodContainers/lemoncake.rsi/meta.json → Resources/Textures/Objects/FoodContainers/lemoncake.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/limecake.rsi/icon.png → Resources/Textures/Objects/FoodContainers/limecake.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 947 B After Width:  |  Height:  |  Size: 947 B

0

Resources/Textures/Objects/DrinkFoodContainers/limecake.rsi/meta.json → Resources/Textures/Objects/FoodContainers/limecake.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/meatbread.rsi/icon.png → Resources/Textures/Objects/FoodContainers/meatbread.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1009 B After Width:  |  Height:  |  Size: 1009 B

0

Resources/Textures/Objects/DrinkFoodContainers/meatbread.rsi/meta.json → Resources/Textures/Objects/FoodContainers/meatbread.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/meatpizza.rsi/icon.png → Resources/Textures/Objects/FoodContainers/meatpizza.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 906 B After Width:  |  Height:  |  Size: 906 B

0

Resources/Textures/Objects/DrinkFoodContainers/meatpizza.rsi/meta.json → Resources/Textures/Objects/FoodContainers/meatpizza.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/monkeycubebox.rsi/icon.png → Resources/Textures/Objects/FoodContainers/monkeycubebox.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 433 B After Width:  |  Height:  |  Size: 433 B

0

Resources/Textures/Objects/DrinkFoodContainers/monkeycubebox.rsi/meta.json → Resources/Textures/Objects/FoodContainers/monkeycubebox.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/monkeycubewrap.rsi/icon.png → Resources/Textures/Objects/FoodContainers/monkeycubewrap.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 225 B After Width:  |  Height:  |  Size: 225 B

0

Resources/Textures/Objects/DrinkFoodContainers/monkeycubewrap.rsi/meta.json → Resources/Textures/Objects/FoodContainers/monkeycubewrap.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/mushroompizza.rsi/icon.png → Resources/Textures/Objects/FoodContainers/mushroompizza.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 767 B After Width:  |  Height:  |  Size: 767 B

0

Resources/Textures/Objects/DrinkFoodContainers/mushroompizza.rsi/meta.json → Resources/Textures/Objects/FoodContainers/mushroompizza.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/orangecake.rsi/icon.png → Resources/Textures/Objects/FoodContainers/orangecake.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 887 B After Width:  |  Height:  |  Size: 887 B

0

Resources/Textures/Objects/DrinkFoodContainers/orangecake.rsi/meta.json → Resources/Textures/Objects/FoodContainers/orangecake.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/pizzabox_open.rsi/icon.png → Resources/Textures/Objects/FoodContainers/pizzabox_open.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 278 B After Width:  |  Height:  |  Size: 278 B

0

Resources/Textures/Objects/DrinkFoodContainers/pizzabox_open.rsi/meta.json → Resources/Textures/Objects/FoodContainers/pizzabox_open.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/pizzabox_tag.rsi/icon.png → Resources/Textures/Objects/FoodContainers/pizzabox_tag.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 176 B After Width:  |  Height:  |  Size: 176 B

0

Resources/Textures/Objects/DrinkFoodContainers/pizzabox_tag.rsi/meta.json → Resources/Textures/Objects/FoodContainers/pizzabox_tag.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/pizzaboxstack.rsi/icon.png → Resources/Textures/Objects/FoodContainers/pizzaboxstack.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 319 B After Width:  |  Height:  |  Size: 319 B

0

Resources/Textures/Objects/DrinkFoodContainers/pizzaboxstack.rsi/meta.json → Resources/Textures/Objects/FoodContainers/pizzaboxstack.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/pizzaboxstack.rsi/pizzaboxstack-0.png → Resources/Textures/Objects/FoodContainers/pizzaboxstack.rsi/pizzaboxstack-0.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 290 B After Width:  |  Height:  |  Size: 290 B

0

Resources/Textures/Objects/DrinkFoodContainers/pizzaboxstack.rsi/pizzaboxstack-1.png → Resources/Textures/Objects/FoodContainers/pizzaboxstack.rsi/pizzaboxstack-1.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 302 B After Width:  |  Height:  |  Size: 302 B

0

Resources/Textures/Objects/DrinkFoodContainers/pizzaboxstack.rsi/pizzaboxstack-2.png → Resources/Textures/Objects/FoodContainers/pizzaboxstack.rsi/pizzaboxstack-2.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 304 B After Width:  |  Height:  |  Size: 304 B

0

Resources/Textures/Objects/DrinkFoodContainers/pizzaboxstack.rsi/pizzaboxstack-3.png → Resources/Textures/Objects/FoodContainers/pizzaboxstack.rsi/pizzaboxstack-3.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 302 B After Width:  |  Height:  |  Size: 302 B

0

Resources/Textures/Objects/DrinkFoodContainers/pizzaboxstack.rsi/pizzaboxstack-4.png → Resources/Textures/Objects/FoodContainers/pizzaboxstack.rsi/pizzaboxstack-4.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 319 B After Width:  |  Height:  |  Size: 319 B

0

Resources/Textures/Objects/DrinkFoodContainers/pizzamargherita.rsi/icon.png → Resources/Textures/Objects/FoodContainers/pizzamargherita.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 721 B After Width:  |  Height:  |  Size: 721 B

0

Resources/Textures/Objects/DrinkFoodContainers/pizzamargherita.rsi/meta.json → Resources/Textures/Objects/FoodContainers/pizzamargherita.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/plaincake.rsi/icon.png → Resources/Textures/Objects/FoodContainers/plaincake.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 974 B After Width:  |  Height:  |  Size: 974 B

0

Resources/Textures/Objects/DrinkFoodContainers/plaincake.rsi/meta.json → Resources/Textures/Objects/FoodContainers/plaincake.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/pumpkinpie.rsi/icon.png → Resources/Textures/Objects/FoodContainers/pumpkinpie.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 785 B After Width:  |  Height:  |  Size: 785 B

0

Resources/Textures/Objects/DrinkFoodContainers/pumpkinpie.rsi/meta.json → Resources/Textures/Objects/FoodContainers/pumpkinpie.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/tofubread.rsi/icon.png → Resources/Textures/Objects/FoodContainers/tofubread.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 949 B After Width:  |  Height:  |  Size: 949 B

0

Resources/Textures/Objects/DrinkFoodContainers/tofubread.rsi/meta.json → Resources/Textures/Objects/FoodContainers/tofubread.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/vegetablepizza.rsi/icon.png → Resources/Textures/Objects/FoodContainers/vegetablepizza.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 892 B After Width:  |  Height:  |  Size: 892 B

0

Resources/Textures/Objects/DrinkFoodContainers/vegetablepizza.rsi/meta.json → Resources/Textures/Objects/FoodContainers/vegetablepizza.rsi/meta.json

0

Resources/Textures/Objects/DrinkFoodContainers/xenomeatbread.rsi/icon.png → Resources/Textures/Objects/FoodContainers/xenomeatbread.rsi/icon.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1012 B After Width:  |  Height:  |  Size: 1012 B

0

Resources/Textures/Objects/DrinkFoodContainers/xenomeatbread.rsi/meta.json → Resources/Textures/Objects/FoodContainers/xenomeatbread.rsi/meta.json