Compare commits

..

No commits in common. "55314cb8bb01027f34b97f4859b3ca9fedf51d54" and "5ebae2c628fbe2d4ba813dd7a43454cb4fcf48a7" have entirely different histories.

18 changed files with 10 additions and 10 deletions

View File

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

View File

Before

Width:  |  Height:  |  Size: 80 KiB

After

Width:  |  Height:  |  Size: 80 KiB

View File

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

View File

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 49 KiB

View File

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

View File

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 56 KiB

View File

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 52 KiB

View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 38 KiB

View File

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 63 KiB

View File

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 54 KiB

View File

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 54 KiB

View File

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

View File

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 55 KiB

View File

@ -1,9 +1,9 @@
{
"materials": {
"id": "original:titanium_weave",
"texture": "original/assets/textures/materials/composite/titanium_weave.png",
"displayName": "items.materials.original.composites.titanium_weave",
"description": "items.materials.original.composites.titanium_weave.desc",
"texture": "original/assets/textures/materials/ore/titaniumweave.png",
"displayName": "items.materials.original.compositess.titanium_weave",
"description": "items.materials.original.compositess.titanium_weave.desc",
"meta": {
"storeCategory": "original:materials",
"storePrice": 50,

View File

@ -1,9 +1,9 @@
{
"materials": {
"id": "original:ingot_aluminum",
"texture": "original/assets/textures/materials/ingot/ingot_aluminum.png",
"displayName": "items.materials.original.ingots.ingot_aluminum",
"description": "items.materials.original.ingots.ingot_aluminum.desc",
"texture": "original/assets/textures/materials/ingot/aluminum.png",
"displayName": "items.materials.original.ingots.aluminum",
"description": "items.materials.original.ingots.aluminum.desc",
"meta": {
"storeCategory": "original:ingots",
"storePrice": 50,

View File

@ -1,9 +1,9 @@
{
"materials": {
"id": "original:ingot_copper",
"texture": "original/assets/textures/materials/ingot/ingot_copper.png",
"displayName": "items.materials.original.ingots.ingot_copper",
"description": "items.materials.original.ingots.ingot_copper.desc",
"texture": "original/assets/textures/materials/ingot/copper_ingot.png",
"displayName": "items.materials.original.ingots.copper_ingot",
"description": "items.materials.original.ingots.copper_ingot.desc",
"meta": {
"storeCategory": "original:ingots",
"storePrice": 50,

View File

@ -1,7 +1,7 @@
{
"materials": {
"id": "original:ore_ilmenite",
"texture": "original/assets/textures/materials/ore/ore_ilmenite.png",
"texture": "original/assets/textures/materials/ore/ilmenite.png",
"displayName": "items.materials.original.ores.ore_ilmenite",
"description": "items.materials.original.ores.ore_ilmenite.desc",
"meta": {