Commit pending working-tree changes (local edits, line endings)
This commit is contained in:
1 parent
1d1192977b
commit
2ea57b7240
23 files changed
+767
-767
No files matched your search
+13
-13
@@ -1,14 +1,14 @@
|
||||
{
|
||||
"Kind": "item",
|
||||
"Items": [
|
||||
{
|
||||
"Id": "food/ration",
|
||||
"Name": "items/food/ration/name",
|
||||
"Description": "items/food/ration/desc",
|
||||
"Cost": 5,
|
||||
"Sprite": "food/ration",
|
||||
"ItemType": "Food",
|
||||
"ItemAction": "null"
|
||||
}
|
||||
]
|
||||
{
|
||||
"Kind": "item",
|
||||
"Items": [
|
||||
{
|
||||
"Id": "food/ration",
|
||||
"Name": "items/food/ration/name",
|
||||
"Description": "items/food/ration/desc",
|
||||
"Cost": 5,
|
||||
"Sprite": "food/ration",
|
||||
"ItemType": "Food",
|
||||
"ItemAction": "null"
|
||||
}
|
||||
]
|
||||
}
|
||||
+13
-13
@@ -1,14 +1,14 @@
|
||||
{
|
||||
"Kind": "item",
|
||||
"Items": [
|
||||
{
|
||||
"Id": "food/wolf_meat",
|
||||
"Name": "items/food/wolf_meat/name",
|
||||
"Description": "items/food/wolf_meat/desc",
|
||||
"Cost": 1,
|
||||
"Sprite": "food/wolf_meat",
|
||||
"ItemType": "Resource,Food",
|
||||
"ItemAction": "null"
|
||||
}
|
||||
]
|
||||
{
|
||||
"Kind": "item",
|
||||
"Items": [
|
||||
{
|
||||
"Id": "food/wolf_meat",
|
||||
"Name": "items/food/wolf_meat/name",
|
||||
"Description": "items/food/wolf_meat/desc",
|
||||
"Cost": 1,
|
||||
"Sprite": "food/wolf_meat",
|
||||
"ItemType": "Resource,Food",
|
||||
"ItemAction": "null"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,14 +1,14 @@
|
||||
{
|
||||
"Kind": "item",
|
||||
"Items": [
|
||||
{
|
||||
"Id": "resource/branches",
|
||||
"Name": "items/resource/branches/name",
|
||||
"Description": "items/resource/branches/desc",
|
||||
"Cost": 0,
|
||||
"Sprite": "resource/branches",
|
||||
"ItemType": "Resource",
|
||||
"ItemAction": "null"
|
||||
}
|
||||
]
|
||||
{
|
||||
"Kind": "item",
|
||||
"Items": [
|
||||
{
|
||||
"Id": "resource/branches",
|
||||
"Name": "items/resource/branches/name",
|
||||
"Description": "items/resource/branches/desc",
|
||||
"Cost": 0,
|
||||
"Sprite": "resource/branches",
|
||||
"ItemType": "Resource",
|
||||
"ItemAction": "null"
|
||||
}
|
||||
]
|
||||
}
|
||||
Reference in new issue
Block a user