5,880 Commits over 1,584 Days - 0.15cph!
Cleanup method that returns max stock
Fix the maxStock for NPC vending orders being confusing
- it used to only change the initial stock and then refill to the maximum of the vendor
- now it just sets a different max stock for that individual vending order
▉ ▍▉█ ▇▇▌▅▆ ▌█▆ ▇▅█▊▌▆ ▍▆▉▄▊▇▄ ▌▄▉▊▌▊▇ ▋▆▊▇▆▋▅▌▅▄▊█▍ ▄▄▋▋▅▌ ▉▆ ▄▌▉ ▇▆▇█▆▆██▅ ▄█▅█▅▇▅ ▄▄▄ ▉█▅▇▄▌▇▌▉ ▍▄▄ ▊▇▄▄▄▇▋▊▌ ▊▅▇▌▉▌ ▆▉▌▊▉ ▅▍▇▅▅ ▌▇▉▍█ ▌█ ▄▄▌
Add "spawnvendor" command to spawn vendors in the editor (they are two different prefabs glued together)
merge from main -> waterwell_stock_decrease
▉ ▅▄▊▊ ██▍▇▇▉█▌▇ ▌▊▌▊▉ ▅▌█ ▋▉█▆▇▄▇ ▍▅▅▇▄ ▍▉ ▇▋▅▍▉ ▊▆▉▉▉▅ ▇▅▉▊▍▆▅▆ ▅▇ █▆▇▄▇▉ █▅█ ▅▌█▇▆▅▉▊ ▉▆▅ ▆▄▍▅▄▌▌ ▇▆▌▅▋▋▅▍
▄ ▌▇█▅▉▍█▆▍▌ ▋▆▌▅▄█▄▉▋▋▅▉▆▇▊▉▇▅▅▌▌▍▍▉█▉
▄ ▊▅▄ ▍▉█▅▋▅▆█▉▇▋ █▅▇▉▋▆▋▄▊▊▌▊▌ ▋▇▌█▊ █▄ ▌▊ ▋▍▇▇▊▊▆ ▍▅▆▌ ▇▄▊▇▆ ▋▉ ▇▊██▄▌ ▊▇ █▆▌▋ ▅▆▍▋▇█▆█ ▉▄▋▊█▊▋ ▉▋▊█▅ ▍▌▊▆▆ ▇▌█▋ ▇▆ ▄▅█▄▉█ ▇▇ ▍▍▆ ▍▇▌▋ ▄█ ▄▅▉▋ ▌▋▋▇ ▊▊▉▄ ▉▌▋▆ ▋▋▉ ▍▉▆▄█
▄ ▄▋▊▄▌ ▉▄▉▇▌▌▆▆▇▅▇▅ █▄ ▍▆▋▍█▉▍▉▆▋▅▌ ▌▇▇▋▄█ ▉▅▌▄▉▄▍█▉ ▌▅ ▋██▋▇▅▌ ▇▋▆█▌▍▌ ▋▆ ▍▍▌▍▊▅▌▉ ▇▅▌ ▊▊▄▍▄ ▅██ ▆▊▅▉▅ ▉█ ▆▅▅▇ ▌▆ ▋▋▍█▋ ▍▉▊ ▉▍█▅ ▆▅▋▋ ▆█▋ ▉▇▉▊▌ █▊█▆▌▋█▄▇▊▍▌▄▉ ▇▆▍▌▊▊ ▊█▌▇▊▉▍ ▋▉▇▌▆ ▅▅▍▄█▇▋▌▉█ ▋▊ ▅▌▊▊▄▉▉ ▉▌▍▅ ▄▌▄▉▇ ▋▊ █▄▌▊▋▌▉ ▇▋▊▄ ▌ ▅▅▊▆▆▌▌▆ ▊▄▋▆ █▅▍ ▍▆█▋█▅▌▍▋▌█▄▋▅▋▌▍█▍▌▍▇▉▌▊█▉ ▄█▇▉ ▆ ▊▍▉ ▄▆▌▊ ▋▇▆▍█ ▋▋▄▅ ▌▅ ▋▋█▆▍ ▊▊▊▅▍ ▊▋▉▇ ▆▆ █▌▉▊ ▊▅▌▆█▋ ▇▅▄▍ ▇▇▅▆▊▋▌ ▇▍▍█▉▊▋▅ ▉▊▊ ▅█ ▇▆▊▅▉▉ ▍▅▌▅▆█▊ ▆▉ ▆▉▆
▍ ▇▉▇▇▉ ▍▄▋▅ █▅▄▅▅█▋█▇▊▅▋▋▌▌▋▋ ▌▉ ▍▌▇█
▌ ▋▅▍█▌▄ ▄▉█ ▍▉▋▅▋▅ ▍▅▆▍▍▆▇ ▅▊ █▄▊▄▆▅ ▋▊▅▉█▇▍
▇ ▌▄▇▄▅ ▊▉▅▇ ▋▆▊▉▊▆▊▇▅▋▉▉▌▅▇▉█▋ ▅▌ ▄▍█▄
▋ ▍▍▊ ▋▉▇▄▋ ▆▉▍ ▉▍▉███▅ ▉▅▋▇▄ ▄▉▍▍▇ █▍▅▆▄█ ▅█ ▌▅▆▄▆ ▉█ ▉▄▋▊▋▍ ▌▅▊█▇▍▊▌ ▊▅▊▇▋▇▆▇ ▊▉ ▉█▍▉▆▌ ▉▍ ▆▌▉▍▋ ▆▅█▊▋▉▋▊ ▉▉▉▆ ▄▉▊▉▅▅ ▆█▆▄▇▍
▊ ▆▋▇ ▍▇▊ ▄▄▄▄▆█▌▇ ▊▍▋ ▍▆▇▇▇▍█▋ ▋ ▆▋▊▋▊▌▌ ▇▍█ ▌▅▌█▉▄▌▇ ▌▋ ▉▅▅ ▅█▆▆▅▆ ▌▋▍ ▆ ▉█▇█▆█ █▊▉█▆▅▉▅▋▋▆ ▉▊▊▍▆▄▉█ ▆▇▉▊ ▄▄▊ ▌▌▆▄▅▊▉▍▇ ▅▄▋▍▄ ▌▅█▇ ▄▇▅▆▇ ▇█▋▍▄▄▌ ▍██▉▆ ▋▌▋▊▉▄▊▆ ▌▆ ▇▊█▇▆▅▆▄▊▉▉▉ ▌▊█▋█▌ ▉▆▉▆▇▋ ▅▆▊▋█▇█ ▄█ ▅▄▄█▋ ▌▊▊▇▋▄▊ ▅▄▅▅▌▉▌▊
Switch Newtonsoft test to use Unity's test framework
▆ ▉▉▍▋▇█▄ ▄▅▇▋█▉▅▊▅▌▉▄▅▇▊ █▌█▍ ▆▆▋▌█▇█▋▆▆▌ █▋▅ ▄▍▍ ▍▋▇▆▊▄▆▆ ▊▍▍▌▌▅▄▇▇▅▋ ▇▆▍ ▇▄▋▍█▆█▋ ▌▅█▊█▅▅ ▋▊▆█ ▉▋ ██ ▍▇▄▌▄▇▄▇▊▊ ▄▇▆█▊▉▍▌ ▌▄▌▇ ▆▋▍ ▆▊██▌▋ ▅▍▉▌▊██▇
▊ ▍██▄▊▌ ▍▌▉▅█▉▄▍█▆▋ ▌▄▋▄ ▆▇▇▋▊ ▅▅▌ ▆▉▍▌▊▄▊▅▍▍▆▌ ▄▄▆▌ █▌ ▄▉▆▉▋▊ ▋▊ ▊▄▄▇▍▊▌ ▄▇▉ ▉▋▇▍▋ ▄▋▌▋▌▍▅▄▉▆▋▅▉▉▊▌▆▄▄█▉▄ ▊▍▊ ▍▄▋▊▇▊ ▉▅ ▌▅▌▌▌ ▌▊█▄▉▄▆▉▇█▊ ▋▆▋▆ █▅ ▍▅▌▅▌▍
▍ ▊▋▄▄▄ ▌███▄▌▄▆▆▉▊▌▉▋▆▇▇█▆▊ ▅▇▄▍▅▊█ ▉▌ ▊▉▊▄▋▋▌▋▌█▅▋▊▄▅▍▉ ▋█▉▉▆▆ ▌█▌▉█▉▇ ▇▇▉█▊▄
Rewrite Newtonsoft JSON converts to not use JSON.LINQ (which is what they did in Newtonsoft 8.0.0)
- tests pass
▄ ▊▇▉▄▇ ▅▇▇▆ ▊▌▊▊▌▇▅ ▄▆ ▍▇▆▉
▉ ▉▅▋▇▆ ▅▄▉▅ ▌█▅▅▆▋▋▊▍▌▅▋▉▆▅▄▉▇▌█▊▋▄▅▋ ▋▍ ▅▍▇▌
▍ ▄▊▋ ▅▌▍ ▉▍▇▆▉▊ ▉▋▉▊▉ ▌▍█ ▉▋▉▊▌ ▆▆██▋█▄ ▄▄ ▉▋▋ ▄▉▄▆▄▇ ▋▅▄▊▉▋▌ ▄▊▊▌█ ▇▅ ▄▆▊▊▄▉ ▉▌▉▊▉ ▅▌▌█ ▇▌▆█▇ ▌█▋▉▊▊▊▊▋▇ ▆▉▅▊ ▊▌▌ ▇▅ ▉▌▌ ▉█▄▇▌ ▍▊▇▋▉▍▄ ▆▊█▄▍ ▇▍▌▄▅█ ▍▍▆▆▉█
▇ ▊▆▊ ▌▉▊▍▇ █▉▊ ▆▍▆█▉█▋▄▌ ▆▌▌▅▊ ▍▅▄█▍ ▄▄▍▆▇▊▇▆ ▊▆▌▆ ▌▄▋ ▇▉▄▄▆▌ ▄▊▌▄▋▇▉▅ ▉▉▍▍ ▉█▊ ▇▋▌▌▅▅ ▄▋▍▄▄▋█ ▆▇▄▍ ▅▄ ▄▇ ▄▆▉▆▌▄ ▄▊ ▌▆▆▊▄▄▌▅ ▆▄▊▍ ▌▌▍▋▊▅▍▆
▇ █▆▉ ▌▋▄▇▇▌▆ █▉ ▅▅▍ ▄▇▊▆▌▉▋▇▄▍▋▅▌█▆▇▊ ▄▌█▄▇▌▉█
▋ ▅▉▇▇▍▉▌ ▆█▉▊▌▊█ ▆▊▋▊ ▌▊▇▉▍▍▇▍█▉▊▌ ▄▆ ▄██▅▊▋▍▊▅▍▍▍▇▉ ▋▍▄▄█▅█▄ █▉▉▇▄ ▍▄▆▊▊█ █▌▅ ▄▄▍▄ ▊▅▉▇▊▄ ▊▋▅ ▉▉ ▊▇ ▌▋▄▄▌▊▇ ▊▍▊▍▇▇█ ▌▋▉▍▍▄ ██▆▉▅▍▉ ▋▆▌█ ▊▄▆▉ ▊▋▅▅█▊▇▋ ▉▉ ▄▇ ▉▋▍▉▊▊ ▉▍▇▉ ▉▌▍▅▉▇▅ ▅▆▆▄▌▅▍ ▇▋ █▇▄▋ ▋▍▅▉▍
▅ ▅▊▌▆▋ █▆▇▌ ▇▆▄▄▉▍▊██▅▋▊█▉▆▌▍▅▊▍▆▆█▌▄ ▄▇ ▍▉▍▇
▉ ▊▅▋ ▍█▆▋▋▄ ▊▇▊█▄▋▉ ▇▇▆▄▇▉▋▋ ▊▊ ▄▆▍█▌ ▇▋ ▆▌▆█ ▊▅█▌▅▉ ▊▋ ▉▉▋█▊ ▄█▍▊ ▅▄▇ ▍▇▌▅▉▌ ▊▌▍▌
█ █▇▌▅▍█▋ ▆▉▋▅▌▇▆ ▆▍▌▆ ▊▉ ▇▌▇▇ ▄▅▉ ▅▋▍▌▋ ▊▌▋ ▍▋▍▌█▋▌ ▅▉▆▅▉▇ ▌▅▆▉▅ ▌▄▉▍▉▅▋▌▊ ▉▊ ▍█▆ ██▇▅ ▌▇▆▌▉▋▌▅▌ ▊▆▆▉ ▊▇▊▌▌ ▅▍▆▌▅▉ ▄▆▉▊▌▍▄ ▌▉▄ ▇▆▍▍█▌▄▇▆▅▉▇▍▍▊▌▇▊ ▇▇▌▍▆▊▋▆ ▆▆▇ ▍▉▇▋▉ ▆▄▊ ▌▇▇▍▌▊▄▍▊▇ ▉▄▄▉ ██▅▅█▄▆▆
▇ ▌▍█▆▅▉▋▄▌▆ ▊▉▇▌▄▄▉▅▌▆▍▉▊▅▋█▇▉▅▅▇▍▊▅▊▆█▊▋▌▅▊▌
merge from fix_second_hotbar -> main
Fix not being able to drag icons into the bottom row of the main inventory (second hotbar) due to the main inventory being rendered on top of the hotbar
Fix swaphotbar only working if ran from a bind, switch it to only running if the second hotbar is enabled / rendered
Fix keybinds showing under the second hotbar
merge from fix_highwall_decay_delay -> main
Fix high walls having a 5hr delay decay: should start decaying right away now that it uses upkeep
▊ ▆▅▊█▊ ██▄▇ ▉▊▅▄▌▌▋▇█▉▇▇▄▇▊▊▌▆▉▍▊▄▉▇▌ ▉▇ ▆▊█▊
merge from editor_hotbar_swap -> main
Cleanup redundant UIBeltSecondRowPreview.cs
Fix hideInvalidIcons not set in the second hotbar so it wasn't going away when convar was disabled
Shift up the second hotbar so it matches inventory placement
merge from main -> editor_hotbar_swap
merge from fix_instantiate_persistant_setactive -> main
Fix editor printing errors in ItemIcon.OnEnable() and QuickCraft.OnEnable()
- caused by an editor optimization to not create copies of single use prefabs (GameUI)
- however GameUI is cursed and called SetActive() from inside Awake() which caused OnDisabled() to not be called, causing some of the UI prefabs to get into weird states
- kept the optimization but locked it behind an editor pref for now until it can be properly fixed
Fix the second hotbar prefab not referencing the main inventory
Add the second hotbar to GameUI.Hud.prefab (so much for the dream of not reserializing the large UI prefabs)
Make the second hotbar a prefab instead of cloning the normal hotbar
Update the GameUI.Inventory.prefab prefab manually with only the fields we want to change (instead of the whole prefab reserializing)
