Skip to content

Commit bccdf6c

Browse files
authored
Merge pull request #1976 from VT-14/log_cleaning
Removed Some Log Spam
2 parents 3f45c35 + 3a82082 commit bccdf6c

36 files changed

+288
-266
lines changed

src/main/resources/assets/bloodmagic/models/block/blockalchemyarray.json

-6
This file was deleted.

src/main/resources/assets/bloodmagic/models/block/blockbloodtank.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"__comment": "Copyright © InsomniaKitten 2017",
33
"textures": {
4-
"particle": "bloodmagic:blocks/BlankRune",
5-
"texture": "bloodmagic:blocks/BloodTank"
4+
"particle": "bloodmagic:block/blankrune",
5+
"texture": "bloodmagic:block/bloodtank"
66
},
77
"elements": [
88
{

src/main/resources/assets/bloodmagic/models/block/blockdimensionalportal.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"textures": {
3-
"particle": "bloodmagic:blocks/lifeEssenceFlowing",
4-
"portal": "bloodmagic:blocks/lifeEssenceFlowing"
3+
"particle": "bloodmagic:block/lifeessenceflowing",
4+
"portal": "bloodmagic:block/lifeessenceflowing"
55
},
66
"elements": [
77
{ "from": [ 6, 0, 0 ],

src/main/resources/assets/bloodmagic/models/block/blockdimensionalportalew.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"textures": {
3-
"particle": "bloodmagic:blocks/lifeEssenceFlowing",
4-
"portal": "bloodmagic:blocks/lifeEssenceFlowing"
3+
"particle": "bloodmagic:block/lifeessenceflowing",
4+
"portal": "bloodmagic:block/lifeessenceflowing"
55
},
66
"elements": [
77
{ "from": [ 6, 0, 0 ],

src/main/resources/assets/bloodmagic/models/block/blockdimensionalportalns.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"textures": {
3-
"particle": "bloodmagic:blocks/lifeEssenceFlowing",
4-
"portal": "bloodmagic:blocks/lifeEssenceFlowing"
3+
"particle": "bloodmagic:block/lifeessenceflowing",
4+
"portal": "bloodmagic:block/lifeessenceflowing"
55
},
66
"elements": [
77
{ "from": [ 0, 0, 6 ],

src/main/resources/assets/bloodmagic/models/block/blockinputroutingnode.json

-7
This file was deleted.

src/main/resources/assets/bloodmagic/models/block/blockmasterroutingnode.json

-8
This file was deleted.

src/main/resources/assets/bloodmagic/models/block/blockoutputroutingnode.json

-7
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"parent": "block/cube_all",
33
"textures": {
4-
"all": "bloodmagic:blocks/PhantomBlock"
4+
"all": "bloodmagic:block/phantomblock"
55
}
66
}

src/main/resources/assets/bloodmagic/models/block/blocksoulforge.json

-9
This file was deleted.

src/main/resources/assets/bloodmagic/models/block/blockspectral.json

-6
This file was deleted.

src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_corrosive.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"parent": "builtin/generated",
33
"textures": {
4-
"layer0": "bloodmagic:items/SentientBow_corrosive"
4+
"layer0": "bloodmagic:item/sentientbow_corrosive"
55
},
66
"display": {
77
"thirdperson_righthand": {

src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_corrosive_pulling_0.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"parent": "builtin/generated",
33
"textures": {
4-
"layer0": "bloodmagic:items/SentientBow_corrosive_pulling_0"
4+
"layer0": "bloodmagic:item/sentientbow_corrosive_pulling_0"
55
},
66
"display": {
77
"thirdperson_righthand": {

src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_corrosive_pulling_1.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"parent": "builtin/generated",
33
"textures": {
4-
"layer0": "bloodmagic:items/SentientBow_corrosive_pulling_1"
4+
"layer0": "bloodmagic:item/sentientbow_corrosive_pulling_1"
55
},
66
"display": {
77
"thirdperson_righthand": {

src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_corrosive_pulling_2.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"parent": "builtin/generated",
33
"textures": {
4-
"layer0": "bloodmagic:items/SentientBow_corrosive_pulling_2"
4+
"layer0": "bloodmagic:item/sentientbow_corrosive_pulling_2"
55
},
66
"display": {
77
"thirdperson_righthand": {

src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_destructive.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"parent": "builtin/generated",
33
"textures": {
4-
"layer0": "bloodmagic:items/SentientBow_destructive"
4+
"layer0": "bloodmagic:item/sentientbow_destructive"
55
},
66
"display": {
77
"thirdperson_righthand": {

src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_destructive_pulling_0.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"parent": "builtin/generated",
33
"textures": {
4-
"layer0": "bloodmagic:items/SentientBow_destructive_pulling_0"
4+
"layer0": "bloodmagic:item/sentientbow_destructive_pulling_0"
55
},
66
"display": {
77
"thirdperson_righthand": {

src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_destructive_pulling_1.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"parent": "builtin/generated",
33
"textures": {
4-
"layer0": "bloodmagic:items/SentientBow_destructive_pulling_1"
4+
"layer0": "bloodmagic:item/sentientbow_destructive_pulling_1"
55
},
66
"display": {
77
"thirdperson_righthand": {

src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_destructive_pulling_2.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"parent": "builtin/generated",
33
"textures": {
4-
"layer0": "bloodmagic:items/SentientBow_destructive_pulling_2"
4+
"layer0": "bloodmagic:item/sentientbow_destructive_pulling_2"
55
},
66
"display": {
77
"thirdperson_righthand": {

src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_pulling_0.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"parent": "builtin/generated",
33
"textures": {
4-
"layer0": "bloodmagic:items/SentientBow_pulling_0"
4+
"layer0": "bloodmagic:item/sentientbow_pulling_0"
55
},
66
"display": {
77
"thirdperson_righthand": {

src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_pulling_1.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"parent": "builtin/generated",
33
"textures": {
4-
"layer0": "bloodmagic:items/SentientBow_pulling_1"
4+
"layer0": "bloodmagic:item/sentientbow_pulling_1"
55
},
66
"display": {
77
"thirdperson_righthand": {

src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_pulling_2.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"parent": "builtin/generated",
33
"textures": {
4-
"layer0": "bloodmagic:items/SentientBow_pulling_2"
4+
"layer0": "bloodmagic:item/sentientbow_pulling_2"
55
},
66
"display": {
77
"thirdperson_righthand": {

src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_steadfast.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"parent": "builtin/generated",
33
"textures": {
4-
"layer0": "bloodmagic:items/SentientBow_steadfast"
4+
"layer0": "bloodmagic:item/sentientbow_steadfast"
55
},
66
"display": {
77
"thirdperson_righthand": {

src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_steadfast_pulling_0.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"parent": "builtin/generated",
33
"textures": {
4-
"layer0": "bloodmagic:items/SentientBow_steadfast_pulling_0"
4+
"layer0": "bloodmagic:item/sentientbow_steadfast_pulling_0"
55
},
66
"display": {
77
"thirdperson_righthand": {

src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_steadfast_pulling_1.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"parent": "builtin/generated",
33
"textures": {
4-
"layer0": "bloodmagic:items/SentientBow_steadfast_pulling_1"
4+
"layer0": "bloodmagic:item/sentientbow_steadfast_pulling_1"
55
},
66
"display": {
77
"thirdperson_righthand": {

src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_steadfast_pulling_2.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"parent": "builtin/generated",
33
"textures": {
4-
"layer0": "bloodmagic:items/SentientBow_steadfast_pulling_2"
4+
"layer0": "bloodmagic:item/sentientbow_steadfast_pulling_2"
55
},
66
"display": {
77
"thirdperson_righthand": {

src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_vengeful.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"parent": "builtin/generated",
33
"textures": {
4-
"layer0": "bloodmagic:items/SentientBow_vengeful"
4+
"layer0": "bloodmagic:item/sentientbow_vengeful"
55
},
66
"display": {
77
"thirdperson_righthand": {

src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_vengeful_pulling_0.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"parent": "builtin/generated",
33
"textures": {
4-
"layer0": "bloodmagic:items/SentientBow_vengeful_pulling_0"
4+
"layer0": "bloodmagic:item/sentientbow_vengeful_pulling_0"
55
},
66
"display": {
77
"thirdperson_righthand": {

src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_vengeful_pulling_1.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"parent": "builtin/generated",
33
"textures": {
4-
"layer0": "bloodmagic:items/SentientBow_vengeful_pulling_1"
4+
"layer0": "bloodmagic:item/sentientbow_vengeful_pulling_1"
55
},
66
"display": {
77
"thirdperson_righthand": {

src/main/resources/assets/bloodmagic/models/item/bow/itemsentientbow_vengeful_pulling_2.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"parent": "builtin/generated",
33
"textures": {
4-
"layer0": "bloodmagic:items/SentientBow_vengeful_pulling_2"
4+
"layer0": "bloodmagic:item/sentientbow_vengeful_pulling_2"
55
},
66
"display": {
77
"thirdperson_righthand": {

0 commit comments

Comments
 (0)