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

2018-06-09 20:42:16 +02:00 · 2018-06-09 20:42:16 +02:00 · 7a7867a185
parent 6ecc53a2b5 bd0f8129c4
commit 7a7867a185
1 changed files with 4 additions and 0 deletions
--- a/js/items.json
+++ b/js/items.json
@ -170,6 +170,7 @@
  }, {
    "id": 42,
    "name": "glass",
+<<<<<<< HEAD
    "value": 100
  }, {
    "id": 43,
@ -195,6 +196,9 @@
    "id": 48,
    "name": "bottleapplevenegar",
    "value": 100
+=======
+    "value": 120
+>>>>>>> bd0f8129c4cb654727664b0b7078fc2ee1ec72d8
  }],
  "minerals": {
    "nameFromId": ["bauxite",