Code

Futurism#133

Code

Merged

AtomicFox556 merged 25 commits intoAtomicFox556:masterAtomicFox556/Cataclysm-EOD:masterfrom collectanos:masterCopy head branch name to clipboardNov 13, 2023

+293-1

Commits

Commits on Nov 8, 2023

• Create high_tech_weapons_melee.json and add Laser Saber

  collectanos

  authored
  b09866d

  Copy full SHA for b09866d

Commits on Nov 9, 2023

• Add RC scout car

  collectanos

  authored
  654952e

  Copy full SHA for 654952e

• Update data/json/items/melee/high_tech_weapons_melee.json

  Show description for 911f471
  

  collectanos

  and

  Kenshut

  authored
  911f471

  Copy full SHA for 911f471

• Update data/json/EraOfDecay/items/tools/other.json

  Show description for 11670e8
  

  collectanos

  and

  github-actions[bot]

  authored
  11670e8

  Copy full SHA for 11670e8

• Update data/json/EraOfDecay/items/tools/other.json

  Show description for b28fcea
  

  collectanos

  and

  github-actions[bot]

  authored
  b28fcea

  Copy full SHA for b28fcea

• Update data/json/items/melee/high_tech_weapons_melee.json

  Show description for f16e00b
  

  collectanos

  and

  Kenshut

  authored
  f16e00b

  Copy full SHA for f16e00b

• Update data/json/items/melee/high_tech_weapons_melee.json

  Show description for c8d3790
  

  collectanos

  and

  Kenshut

  authored
  c8d3790

  Copy full SHA for c8d3790

• Update data/json/items/melee/high_tech_weapons_melee.json

  Show description for df30340
  

  collectanos

  and

  Kenshut

  authored
  df30340

  Copy full SHA for df30340

• Update data/json/items/melee/high_tech_weapons_melee.json

  Show description for c92e2c5
  

  collectanos

  and

  Kenshut

  authored
  c92e2c5

  Copy full SHA for c92e2c5

• Update data/json/items/melee/high_tech_weapons_melee.json

  Show description for 1cb7aeb
  

  collectanos

  and

  Kenshut

  authored
  1cb7aeb

  Copy full SHA for 1cb7aeb

• Update data/json/items/melee/high_tech_weapons_melee.json

  Show description for c7d3482
  

  collectanos

  and

  Kenshut

  authored
  c7d3482

  Copy full SHA for c7d3482

• Update data/json/items/melee/high_tech_weapons_melee.json

  Show description for 8182864
  

  collectanos

  and

  Kenshut

  authored
  8182864

  Copy full SHA for 8182864

• Update data/json/items/melee/high_tech_weapons_melee.json

  Show description for 660d076
  

  collectanos

  and

  Kenshut

  authored
  660d076

  Copy full SHA for 660d076

• Update data/json/items/melee/high_tech_weapons_melee.json

  Show description for 31aab12
  

  collectanos

  and

  github-actions[bot]

  authored
  31aab12

  Copy full SHA for 31aab12

• Update data/json/EraOfDecay/items/tools/other.json

  Show description for 1010aa7
  

  collectanos

  and

  github-actions[bot]

  authored
  1010aa7

  Copy full SHA for 1010aa7

• Update data/json/items/melee/high_tech_weapons_melee.json

  Show description for addf9a3
  

  collectanos

  and

  Kenshut

  authored
  addf9a3

  Copy full SHA for addf9a3

• Update data/json/items/melee/high_tech_weapons_melee.json

  Show description for 5e712b9
  

  collectanos

  and

  Kenshut

  authored
  5e712b9

  Copy full SHA for 5e712b9

• Update data/json/items/melee/high_tech_weapons_melee.json

  Show description for 78e7d91
  

  collectanos

  and

  Kenshut

  authored
  78e7d91

  Copy full SHA for 78e7d91

• Update data/json/items/melee/high_tech_weapons_melee.json

  Show description for d22f607
  

  collectanos

  and

  Kenshut

  authored
  d22f607

  Copy full SHA for d22f607

• Update data/json/items/melee/high_tech_weapons_melee.json

  Show description for 798613e
  

  collectanos

  and

  github-actions[bot]

  authored
  798613e

  Copy full SHA for 798613e

• Update data/json/items/melee/high_tech_weapons_melee.json

  Show description for cf7a1a6
  

  collectanos

  and

  github-actions[bot]

  authored
  cf7a1a6

  Copy full SHA for cf7a1a6

Commits on Nov 13, 2023

• Merge branch 'AtomicFox556:master' into master

  collectanos

  authored
  0f3055c

  Copy full SHA for 0f3055c

• Add colored hoodie

  collectanos

  authored
  71972db

  Copy full SHA for 71972db

• Add Colored skirts

  collectanos

  authored
  c034491

  Copy full SHA for c034491

• Update data/json/items/melee/high_tech_weapons_melee.json

  Show description for 21d3b67
  

  AtomicFox556

  and

  github-actions[bot]

  authored
  21d3b67

  Copy full SHA for 21d3b67