Skip to content

Commit

Permalink
Merge branch 'master' into candle-edit
Browse files Browse the repository at this point in the history
  • Loading branch information
Lumi-Virtual authored Apr 23, 2024
2 parents 1d85914 + 2e32db9 commit a6145fb
Show file tree
Hide file tree
Showing 686 changed files with 12,805 additions and 12,793 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ body:
attributes:
label: Attach save file
description: |
`ESC`Main Menu -> `b`Debug Menu -> `i`Info -> `!`Generate minimized save archive
`ESC`Main Menu -> `d`Debug Menu -> `i`Info -> `!`Generate minimized save archive
placeholder: |
Write N/A if not applicable.
Expand Down Expand Up @@ -69,7 +69,7 @@ body:
attributes:
label: Versions and configuration
description: |
`ESC`Main Menu -> `b`Debug Menu -> `i`Info -> `r`Generate game report
`ESC`Main Menu -> `d`Debug Menu -> `i`Info -> `r`Generate game report
placeholder: |
- OS: [e.g. iOS 8 or Windows 10 or Ubuntu 18.04]
- Game Version: [e.g. d6ec466 (64-bit) ]
Expand Down
10 changes: 5 additions & 5 deletions data/json/artifact/artifact_item_types.json
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,8 @@
"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.",
"weight": "750 g",
"volume": "750 ml",
"price": 4000,
"price_postapoc": 10,
"price": "40 USD",
"price_postapoc": "10 cent",
"to_hit": -3,
"material": [ "stone" ],
"symbol": "[",
Expand Down Expand Up @@ -324,8 +324,8 @@
},
"symbol": "7",
"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.",
"price": 1000,
"price_postapoc": 250,
"price": "10 USD",
"price_postapoc": "2 USD 50 cent",
"material": [ { "type": "wood", "portion": 19 }, { "type": "steel" } ],
"volume": "6750 ml",
"longest_side": "97 cm",
Expand All @@ -341,7 +341,7 @@
"weight": "504 g",
"volume": "500 ml",
"longest_side": "25 cm",
"price": 3000,
"price": "30 USD",
"material": [ "wood", "steel" ],
"symbol": ";",
"color": "light_gray",
Expand Down
Loading

0 comments on commit a6145fb

Please sign in to comment.