MasterGordon
/
FactoryMaster
mirror of https://github.com/MasterGordon/FactoryMaster.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MasterGordon/Factory

This commit is contained in:
MasterGordon 2018-06-09 20:42:16 +02:00
parent 6ecc53a2b5 bd0f8129c4
commit 7a7867a185
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/items.json
View File

@ -170,6 +170,7 @@
}, { }, {
"id": 42, "id": 42,
"name": "glass", "name": "glass",
<<<<<<< HEAD
"value": 100 "value": 100
}, { }, {
"id": 43, "id": 43,
@ -195,6 +196,9 @@
"id": 48, "id": 48,
"name": "bottleapplevenegar", "name": "bottleapplevenegar",
"value": 100 "value": 100
=======
"value": 120
>>>>>>> bd0f8129c4cb654727664b0b7078fc2ee1ec72d8
}], }],
"minerals": { "minerals": {
"nameFromId": ["bauxite", "nameFromId": ["bauxite",