Andrei Andreev 4a024c3ae9 Merge branch 'master' into Steam-Webpack ... # Conflicts: # javascripts/core/app/options.js # javascripts/core/secret-formula/shop-purchases.js # src/components/tabs/shop/ShopTab.vue		2022-12-20 00:49:08 +01:00
..
audio	WIP credits and credit song, and fix poopoo with dilation not resetting	2022-02-04 22:30:19 +02:00
fungame	Integrate Webpack and Babel via Vue CLI	2021-11-14 18:52:45 +03:00
images	Update some time-based achievements to match android version (#3010) + fix export button	2022-09-20 20:54:03 -04:00
PlayFab	Reintegrate Playfab Files	2022-12-09 18:44:42 -05:00
Steam	Fix old Ui scaling	2022-12-18 13:25:10 -05:00
stylesheets	Merge branch 'master' into Steam-Webpack	2022-12-20 00:49:08 +01:00
.DS_Store	Post merch changes	2022-10-03 11:37:26 -04:00
about.html	Integrate Webpack and Babel via Vue CLI	2021-11-14 18:52:45 +03:00
font_test.html	Integrate Webpack and Babel via Vue CLI	2021-11-14 18:52:45 +03:00
icon.icns	Mac Icon	2022-04-06 13:45:38 -04:00
icon.png	Integrate Webpack and Babel via Vue CLI	2021-11-14 18:52:45 +03:00
index.html	Reintegrate Playfab Files	2022-12-09 18:44:42 -05:00
slider_test.html	Remove references to Kongregate API/shop	2022-11-15 22:26:11 -06:00
theme-preview.html	Improve New Dimension button UI (#2413)	2022-04-01 19:08:53 +02:00
version.txt	Integrate Webpack and Babel via Vue CLI	2021-11-14 18:52:45 +03:00