Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2025-06-14 21:13:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream changes through 7961fa58

Browse Source 
Signed-off-by: Byron Marohn <combustible@live.com>
This commit is contained in:
Byron Marohn
2018-12-21 12:13:43 -08:00
parent 3f1d807472 7961fa5891
commit 801793cc12
24 changed files with 370 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
worldedit-core/src/main/resources/com/sk89q/worldedit/world/registry/blocks.json
View File

@ -3949,6 +3949,31 @@
"hasContainer": true
}
},
{
"id": "minecraft:dead_brain_coral",
"localizedName": "Dead Brain Coral",
"material": {
"powerSource": false,
"lightValue": 0,
"hardness": 0.0,
"resistance": 0.0,
"ticksRandomly": false,
"fullCube": false,
"slipperiness": 0.6,
"liquid": false,
"solid": true,
"movementBlocker": true,
"burnable": false,
"opaque": true,
"replacedDuringPlacement": false,
"toolRequired": true,
"fragileWhenPushed": false,
"unpushable": false,
"mapColor": "#707070",
"isTranslucent": false,
"hasContainer": false
}
},
{
"id": "minecraft:dead_brain_coral_block",
"localizedName": "Dead Brain Coral Block",
@ -4024,6 +4049,31 @@
"hasContainer": false
}
},
{
"id": "minecraft:dead_bubble_coral",
"localizedName": "Dead Bubble Coral",
"material": {
"powerSource": false,
"lightValue": 0,
"hardness": 0.0,
"resistance": 0.0,
"ticksRandomly": false,
"fullCube": false,
"slipperiness": 0.6,
"liquid": false,
"solid": true,
"movementBlocker": true,
"burnable": false,
"opaque": true,
"replacedDuringPlacement": false,
"toolRequired": true,
"fragileWhenPushed": false,
"unpushable": false,
"mapColor": "#707070",
"isTranslucent": false,
"hasContainer": false
}
},
{
"id": "minecraft:dead_bubble_coral_block",
"localizedName": "Dead Bubble Coral Block",
@ -4124,6 +4174,31 @@
"hasContainer": false
}
},
{
"id": "minecraft:dead_fire_coral",
"localizedName": "Dead Fire Coral",
"material": {
"powerSource": false,
"lightValue": 0,
"hardness": 0.0,
"resistance": 0.0,
"ticksRandomly": false,
"fullCube": false,
"slipperiness": 0.6,
"liquid": false,
"solid": true,
"movementBlocker": true,
"burnable": false,
"opaque": true,
"replacedDuringPlacement": false,
"toolRequired": true,
"fragileWhenPushed": false,
"unpushable": false,
"mapColor": "#707070",
"isTranslucent": false,
"hasContainer": false
}
},
{
"id": "minecraft:dead_fire_coral_block",
"localizedName": "Dead Fire Coral Block",
@ -4199,6 +4274,31 @@
"hasContainer": false
}
},
{
"id": "minecraft:dead_horn_coral",
"localizedName": "Dead Horn Coral",
"material": {
"powerSource": false,
"lightValue": 0,
"hardness": 0.0,
"resistance": 0.0,
"ticksRandomly": false,
"fullCube": false,
"slipperiness": 0.6,
"liquid": false,
"solid": true,
"movementBlocker": true,
"burnable": false,
"opaque": true,
"replacedDuringPlacement": false,
"toolRequired": true,
"fragileWhenPushed": false,
"unpushable": false,
"mapColor": "#707070",
"isTranslucent": false,
"hasContainer": false
}
},
{
"id": "minecraft:dead_horn_coral_block",
"localizedName": "Dead Horn Coral Block",
@ -4274,6 +4374,31 @@
"hasContainer": false
}
},
{
"id": "minecraft:dead_tube_coral",
"localizedName": "Dead Tube Coral",
"material": {
"powerSource": false,
"lightValue": 0,
"hardness": 0.0,
"resistance": 0.0,
"ticksRandomly": false,
"fullCube": false,
"slipperiness": 0.6,
"liquid": false,
"solid": true,
"movementBlocker": true,
"burnable": false,
"opaque": true,
"replacedDuringPlacement": false,
"toolRequired": true,
"fragileWhenPushed": false,
"unpushable": false,
"mapColor": "#707070",
"isTranslucent": false,
"hasContainer": false
}
},
{
"id": "minecraft:dead_tube_coral_block",
"localizedName": "Dead Tube Coral Block",
@ -6995,7 +7120,7 @@
"fragileWhenPushed": true,
"unpushable": false,
"mapColor": "#ff0000",
"isTranslucent": true,
"isTranslucent": false,
"hasContainer": false
}
},
@ -14045,7 +14170,7 @@
"fragileWhenPushed": true,
"unpushable": false,
"mapColor": "#4040ff",
"isTranslucent": true,
"isTranslucent": false,
"hasContainer": false
}
},

28
worldedit-core/src/main/resources/com/sk89q/worldedit/world/registry/items.json
View File

@ -803,6 +803,10 @@
"id": "minecraft:daylight_detector",
"localizedName": "Air"
},
{
"id": "minecraft:dead_brain_coral",
"localizedName": "Air"
},
{
"id": "minecraft:dead_brain_coral_block",
"localizedName": "Air"
@ -811,6 +815,10 @@
"id": "minecraft:dead_brain_coral_fan",
"localizedName": "Air"
},
{
"id": "minecraft:dead_bubble_coral",
"localizedName": "Air"
},
{
"id": "minecraft:dead_bubble_coral_block",
"localizedName": "Air"
@ -823,6 +831,10 @@
"id": "minecraft:dead_bush",
"localizedName": "Air"
},
{
"id": "minecraft:dead_fire_coral",
"localizedName": "Air"
},
{
"id": "minecraft:dead_fire_coral_block",
"localizedName": "Air"
@ -831,6 +843,10 @@
"id": "minecraft:dead_fire_coral_fan",
"localizedName": "Air"
},
{
"id": "minecraft:dead_horn_coral",
"localizedName": "Air"
},
{
"id": "minecraft:dead_horn_coral_block",
"localizedName": "Air"
@ -839,6 +855,10 @@
"id": "minecraft:dead_horn_coral_fan",
"localizedName": "Air"
},
{
"id": "minecraft:dead_tube_coral",
"localizedName": "Air"
},
{
"id": "minecraft:dead_tube_coral_block",
"localizedName": "Air"
@ -1749,7 +1769,7 @@
},
{
"id": "minecraft:lingering_potion",
"localizedName": "Lingering Potion"
"localizedName": "Lingering Water Bottle"
},
{
"id": "minecraft:llama_spawn_egg",
@ -2237,7 +2257,7 @@
},
{
"id": "minecraft:potion",
"localizedName": "Potion"
"localizedName": "Water Bottle"
},
{
"id": "minecraft:powered_rail",
@ -2677,7 +2697,7 @@
},
{
"id": "minecraft:splash_potion",
"localizedName": "Splash Potion"
"localizedName": "Splash Water Bottle"
},
{
"id": "minecraft:sponge",
@ -2885,7 +2905,7 @@
},
{
"id": "minecraft:tipped_arrow",
"localizedName": "Tipped Arrow"
"localizedName": "Arrow of Poison"
},
{
"id": "minecraft:tnt",