BAD merge
This commit is contained in:
iTNTPiston
commit
f3ee572662
7 changed files with 75 additions and 1 deletions
|
|
@ -1,7 +1,12 @@
|
||||||
{
|
{
|
||||||
"files": {
|
"files": {
|
||||||
|
<<<<<<< HEAD
|
||||||
"main.css": "/static/css/main.820e0273.css",
|
"main.css": "/static/css/main.820e0273.css",
|
||||||
"main.js": "/static/js/main.96892c8b.js",
|
"main.js": "/static/js/main.96892c8b.js",
|
||||||
|
=======
|
||||||
|
"main.css": "/static/css/main.bd09d334.css",
|
||||||
|
"main.js": "/static/js/main.21b6773b.js",
|
||||||
|
>>>>>>> 103566beb2b0cc73fb27d9c178a7eb56d80af54c
|
||||||
"static/js/787.ada1a5f8.chunk.js": "/static/js/787.ada1a5f8.chunk.js",
|
"static/js/787.ada1a5f8.chunk.js": "/static/js/787.ada1a5f8.chunk.js",
|
||||||
"static/media/PotLid.png": "/static/media/PotLid.baf78a40199753b3af39.png",
|
"static/media/PotLid.png": "/static/media/PotLid.baf78a40199753b3af39.png",
|
||||||
"static/media/Calamity-Regular.otf": "/static/media/Calamity-Regular.cbeefc650e6ac39335b6.otf",
|
"static/media/Calamity-Regular.otf": "/static/media/Calamity-Regular.cbeefc650e6ac39335b6.otf",
|
||||||
|
|
@ -9,12 +14,18 @@
|
||||||
"static/media/AncientArrow.png": "/static/media/AncientArrow.9a1a41d05b09babd770d.png",
|
"static/media/AncientArrow.png": "/static/media/AncientArrow.9a1a41d05b09babd770d.png",
|
||||||
"static/media/IceArrow.png": "/static/media/IceArrow.c227e7fda67cfc094e27.png",
|
"static/media/IceArrow.png": "/static/media/IceArrow.c227e7fda67cfc094e27.png",
|
||||||
"static/media/FaroshHorn.png": "/static/media/FaroshHorn.ea7e3cbc262af3c30e1d.png",
|
"static/media/FaroshHorn.png": "/static/media/FaroshHorn.ea7e3cbc262af3c30e1d.png",
|
||||||
|
<<<<<<< HEAD
|
||||||
"static/media/Rushroom.png": "/static/media/Rushroom.ab3824a1f76fa5347021.png",
|
"static/media/Rushroom.png": "/static/media/Rushroom.ab3824a1f76fa5347021.png",
|
||||||
|
=======
|
||||||
|
>>>>>>> 103566beb2b0cc73fb27d9c178a7eb56d80af54c
|
||||||
"static/media/SpeedFood.png": "/static/media/SpeedFood.1bde9cae9ffc0c3906ea.png",
|
"static/media/SpeedFood.png": "/static/media/SpeedFood.1bde9cae9ffc0c3906ea.png",
|
||||||
"static/media/HeartyBass.png": "/static/media/HeartyBass.4e0f8e06034479e163fe.png",
|
"static/media/HeartyBass.png": "/static/media/HeartyBass.4e0f8e06034479e163fe.png",
|
||||||
"static/media/SilentPrincess.png": "/static/media/SilentPrincess.6b9283141fbc5993b481.png",
|
"static/media/SilentPrincess.png": "/static/media/SilentPrincess.6b9283141fbc5993b481.png",
|
||||||
"static/media/FaroshScale.png": "/static/media/FaroshScale.cc674ca9ac3cb63f99a3.png",
|
"static/media/FaroshScale.png": "/static/media/FaroshScale.cc674ca9ac3cb63f99a3.png",
|
||||||
|
<<<<<<< HEAD
|
||||||
"static/media/Honey.png": "/static/media/Honey.dbf6fd6eae2e33fc3d6c.png",
|
"static/media/Honey.png": "/static/media/Honey.dbf6fd6eae2e33fc3d6c.png",
|
||||||
|
=======
|
||||||
|
>>>>>>> 103566beb2b0cc73fb27d9c178a7eb56d80af54c
|
||||||
"static/media/Tail.png": "/static/media/Tail.a43cfa310e2c86532247.png",
|
"static/media/Tail.png": "/static/media/Tail.a43cfa310e2c86532247.png",
|
||||||
"static/media/Wood.png": "/static/media/Wood.8105d493814e4ecd145f.png",
|
"static/media/Wood.png": "/static/media/Wood.8105d493814e4ecd145f.png",
|
||||||
"static/media/Diamond.png": "/static/media/Diamond.df6931b37a1f47165e37.png",
|
"static/media/Diamond.png": "/static/media/Diamond.df6931b37a1f47165e37.png",
|
||||||
|
|
@ -26,6 +37,7 @@
|
||||||
"static/media/Shaft.png": "/static/media/Shaft.328e8aa17c1e5f9f0058.png",
|
"static/media/Shaft.png": "/static/media/Shaft.328e8aa17c1e5f9f0058.png",
|
||||||
"static/media/ForestDwellerBow.png": "/static/media/ForestDwellerBow.d2a6ab2d3f59bcc67b4b.png",
|
"static/media/ForestDwellerBow.png": "/static/media/ForestDwellerBow.d2a6ab2d3f59bcc67b4b.png",
|
||||||
"static/media/FaroshClaw.png": "/static/media/FaroshClaw.4da7a445c986e0279916.png",
|
"static/media/FaroshClaw.png": "/static/media/FaroshClaw.4da7a445c986e0279916.png",
|
||||||
|
<<<<<<< HEAD
|
||||||
"static/media/HyruleBass.png": "/static/media/HyruleBass.82ea677144fd38b4665a.png",
|
"static/media/HyruleBass.png": "/static/media/HyruleBass.82ea677144fd38b4665a.png",
|
||||||
"static/media/FireArrow.png": "/static/media/FireArrow.103898dc3f492d3293bd.png",
|
"static/media/FireArrow.png": "/static/media/FireArrow.103898dc3f492d3293bd.png",
|
||||||
"static/media/Lotus.png": "/static/media/Lotus.6006e27a51c66a0b9d3b.png",
|
"static/media/Lotus.png": "/static/media/Lotus.6006e27a51c66a0b9d3b.png",
|
||||||
|
|
@ -37,5 +49,17 @@
|
||||||
"entrypoints": [
|
"entrypoints": [
|
||||||
"static/css/main.820e0273.css",
|
"static/css/main.820e0273.css",
|
||||||
"static/js/main.96892c8b.js"
|
"static/js/main.96892c8b.js"
|
||||||
|
=======
|
||||||
|
"static/media/FireArrow.png": "/static/media/FireArrow.103898dc3f492d3293bd.png",
|
||||||
|
"static/media/Lotus.png": "/static/media/Lotus.6006e27a51c66a0b9d3b.png",
|
||||||
|
"index.html": "/index.html",
|
||||||
|
"main.bd09d334.css.map": "/static/css/main.bd09d334.css.map",
|
||||||
|
"main.21b6773b.js.map": "/static/js/main.21b6773b.js.map",
|
||||||
|
"787.ada1a5f8.chunk.js.map": "/static/js/787.ada1a5f8.chunk.js.map"
|
||||||
|
},
|
||||||
|
"entrypoints": [
|
||||||
|
"static/css/main.bd09d334.css",
|
||||||
|
"static/js/main.21b6773b.js"
|
||||||
|
>>>>>>> 103566beb2b0cc73fb27d9c178a7eb56d80af54c
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -1 +1,5 @@
|
||||||
<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="for Breath of the Wild"/><meta property="og:site_name" content="itntpiston.app"/><meta property="og:title" content="Hundo Duplication Simulator"><meta property="og:type" content="website"><meta property="og:url" content="https://dupl.itntpiston.app/#/"><meta property="og:description" content="for Breath of the Wild"><link rel="manifest" href="/manifest.json"/><title>Hundo Duplication Simulator</title><script defer="defer" src="/static/js/main.96892c8b.js"></script><link href="/static/css/main.820e0273.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
|
<<<<<<< HEAD
|
||||||
|
<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="for Breath of the Wild"/><meta property="og:site_name" content="itntpiston.app"/><meta property="og:title" content="Hundo Duplication Simulator"><meta property="og:type" content="website"><meta property="og:url" content="https://dupl.itntpiston.app/#/"><meta property="og:description" content="for Breath of the Wild"><link rel="manifest" href="/manifest.json"/><title>Hundo Duplication Simulator</title><script defer="defer" src="/static/js/main.96892c8b.js"></script><link href="/static/css/main.820e0273.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
|
||||||
|
=======
|
||||||
|
<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="for Breath of the Wild"/><meta property="og:site_name" content="itntpiston.app"/><meta property="og:title" content="Hundo Duplication Simulator"><meta property="og:type" content="website"><meta property="og:url" content="https://dupl.itntpiston.app/#/"><meta property="og:description" content="for Breath of the Wild"><link rel="manifest" href="/manifest.json"/><title>Hundo Duplication Simulator</title><script defer="defer" src="/static/js/main.21b6773b.js"></script><link href="/static/css/main.bd09d334.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
|
||||||
|
>>>>>>> 103566beb2b0cc73fb27d9c178a7eb56d80af54c
|
||||||
|
|
|
||||||
2
docs/static/css/main.bd09d334.css
vendored
Normal file
2
docs/static/css/main.bd09d334.css
vendored
Normal file
|
|
@ -0,0 +1,2 @@
|
||||||
|
body{-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Fira Sans,Droid Sans,Helvetica Neue,sans-serif;margin:0}code{font-family:source-code-pro,Menlo,Monaco,Consolas,Courier New,monospace}h1{margin:0}@font-face{font-family:CalamitySans;src:url(/static/media/Calamity-Regular.cbeefc650e6ac39335b6.otf) format("opentype")}.Calamity{font-family:CalamitySans}.CommandItemSelected{background-color:#eee}.CommandItemContextSelected{background-color:#eaa}.CommandItemError{color:red}.CommandItem{cursor:pointer;padding:2px 2px 2px 10px}.CommandItem:hover{border:1px solid #000}.InputError{background-color:#eaa}.ItemSlot{background-color:#333;box-sizing:content-box;display:inline-block;height:64px;margin:4px;width:64px}.ItemSlotBroken{background-color:#600}.ItemSlotSave{background-color:#030}.ItemSlotEquipped{background-color:#08f}.ItemImage{border:1px solid #999;box-sizing:border-box;display:inline-block;height:62px;margin:1px;width:62px}.ItemCount{color:#eee;float:left;font-size:10pt;left:8px;position:relative;top:-22px}
|
||||||
|
/*# sourceMappingURL=main.bd09d334.css.map*/
|
||||||
1
docs/static/css/main.bd09d334.css.map
vendored
Normal file
1
docs/static/css/main.bd09d334.css.map
vendored
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
{"version":3,"file":"static/css/main.bd09d334.css","mappings":"AAAA,KAKE,kCAAmC,CACnC,iCAAkC,CAJlC,mIAEY,CAHZ,QAMF,CAEA,KACE,uEAEF,CCZA,GACE,QACF,CAEA,WACE,wBAAyB,CACzB,mFACF,CAEA,UACE,wBACF,CAEA,qBACE,qBACF,CAEA,4BACE,qBACF,CAEA,kBACE,SACF,CAEA,aAEE,cAAe,CADf,wBAEF,CAEA,mBACE,qBACF,CAEA,YACE,qBACF,CAEA,UAKE,qBAAyB,CACzB,sBAAuB,CACvB,oBAAqB,CAJrB,WAAY,CAFZ,UAAW,CACX,UAMF,CAEA,gBACE,qBACF,CAEA,cACE,qBACF,CAEA,kBACE,qBACF,CAEA,WACE,qBAAyB,CACzB,qBAAsB,CAItB,oBAAoB,CADpB,WAAW,CAFX,UAAU,CACV,UAGF,CAKA,WAKE,UAAa,CACb,UAAW,CALX,cAAe,CAGf,QAAQ,CAFR,iBAAiB,CACjB,SAIF","sources":["index.css","App.css"],"sourcesContent":["body {\n margin: 0;\n font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',\n 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',\n sans-serif;\n -webkit-font-smoothing: antialiased;\n -moz-osx-font-smoothing: grayscale;\n}\n\ncode {\n font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',\n monospace;\n}\n","h1 {\n margin: 0\n}\n\n@font-face {\n font-family: CalamitySans;\n src: url(\"assets/Calamity-Regular.otf\") format(\"opentype\");\n}\n\n.Calamity {\n font-family: CalamitySans;\n}\n\n.CommandItemSelected {\n background-color: #eeeeee;\n}\n\n.CommandItemContextSelected {\n background-color: #eeaaaa;\n}\n\n.CommandItemError{\n color: red;\n}\n\n.CommandItem {\n padding: 2px 2px 2px 10px;\n cursor: pointer;\n}\n\n.CommandItem:hover {\n border: 1px solid black\n}\n\n.InputError {\n background-color: #eeaaaa;\n}\n\n.ItemSlot {\n margin: 4px;\n width: 64px;\n height: 64px;\n \n background-color: #333333;\n box-sizing: content-box;\n display: inline-block;\n}\n\n.ItemSlotBroken {\n background-color: #660000;\n}\n\n.ItemSlotSave {\n background-color: #003300;\n}\n\n.ItemSlotEquipped {\n background-color: #0088ff;\n}\n\n.ItemImage {\n border: 1px solid #999999;\n box-sizing: border-box;\n margin:1px;\n width:62px;\n height:62px;\n display:inline-block;\n}\n\n.ItemImageSave {\n}\n\n.ItemCount {\n font-size: 10pt;\n position:relative;\n top:-22px;\n left:8px;\n color:#eeeeee;\n float: left;\n}"],"names":[],"sourceRoot":""}
|
||||||
3
docs/static/js/main.21b6773b.js
vendored
Normal file
3
docs/static/js/main.21b6773b.js
vendored
Normal file
File diff suppressed because one or more lines are too long
39
docs/static/js/main.21b6773b.js.LICENSE.txt
vendored
Normal file
39
docs/static/js/main.21b6773b.js.LICENSE.txt
vendored
Normal file
|
|
@ -0,0 +1,39 @@
|
||||||
|
/**
|
||||||
|
* @license React
|
||||||
|
* react-dom.production.min.js
|
||||||
|
*
|
||||||
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||||
|
*
|
||||||
|
* This source code is licensed under the MIT license found in the
|
||||||
|
* LICENSE file in the root directory of this source tree.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @license React
|
||||||
|
* react-jsx-runtime.production.min.js
|
||||||
|
*
|
||||||
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||||
|
*
|
||||||
|
* This source code is licensed under the MIT license found in the
|
||||||
|
* LICENSE file in the root directory of this source tree.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @license React
|
||||||
|
* react.production.min.js
|
||||||
|
*
|
||||||
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||||
|
*
|
||||||
|
* This source code is licensed under the MIT license found in the
|
||||||
|
* LICENSE file in the root directory of this source tree.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @license React
|
||||||
|
* scheduler.production.min.js
|
||||||
|
*
|
||||||
|
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||||
|
*
|
||||||
|
* This source code is licensed under the MIT license found in the
|
||||||
|
* LICENSE file in the root directory of this source tree.
|
||||||
|
*/
|
||||||
1
docs/static/js/main.21b6773b.js.map
vendored
Normal file
1
docs/static/js/main.21b6773b.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
Reference in a new issue