Skip to content

Commit a6145fb

Browse files
authored
Merge branch 'master' into candle-edit
2 parents 1d85914 + 2e32db9 commit a6145fb

File tree

686 files changed

+12805
-12793
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

686 files changed

+12805
-12793
lines changed

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ body:
2222
attributes:
2323
label: Attach save file
2424
description: |
25-
`ESC`Main Menu -> `b`Debug Menu -> `i`Info -> `!`Generate minimized save archive
25+
`ESC`Main Menu -> `d`Debug Menu -> `i`Info -> `!`Generate minimized save archive
2626
placeholder: |
2727
Write N/A if not applicable.
2828
@@ -69,7 +69,7 @@ body:
6969
attributes:
7070
label: Versions and configuration
7171
description: |
72-
`ESC`Main Menu -> `b`Debug Menu -> `i`Info -> `r`Generate game report
72+
`ESC`Main Menu -> `d`Debug Menu -> `i`Info -> `r`Generate game report
7373
placeholder: |
7474
- OS: [e.g. iOS 8 or Windows 10 or Ubuntu 18.04]
7575
- Game Version: [e.g. d6ec466 (64-bit) ]

data/json/artifact/artifact_item_types.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,8 @@
246246
"description": "A sinister mask made of a smooth green stone. It is the only one of its kind.\nIt may have unknown powers; try activating them.",
247247
"weight": "750 g",
248248
"volume": "750 ml",
249-
"price": 4000,
250-
"price_postapoc": 10,
249+
"price": "40 USD",
250+
"price_postapoc": "10 cent",
251251
"to_hit": -3,
252252
"material": [ "stone" ],
253253
"symbol": "[",
@@ -324,8 +324,8 @@
324324
},
325325
"symbol": "7",
326326
"description": "A harp made of black wood. Faint hypnotic notes ring in the air each time you touch it. It is the only one of its kind.\nIt may have unknown powers; try activating them.",
327-
"price": 1000,
328-
"price_postapoc": 250,
327+
"price": "10 USD",
328+
"price_postapoc": "2 USD 50 cent",
329329
"material": [ { "type": "wood", "portion": 19 }, { "type": "steel" } ],
330330
"volume": "6750 ml",
331331
"longest_side": "97 cm",
@@ -341,7 +341,7 @@
341341
"weight": "504 g",
342342
"volume": "500 ml",
343343
"longest_side": "25 cm",
344-
"price": 3000,
344+
"price": "30 USD",
345345
"material": [ "wood", "steel" ],
346346
"symbol": ";",
347347
"color": "light_gray",

0 commit comments

Comments
 (0)