Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
16df7ed0e1 |
@@ -1,10 +1,16 @@
|
||||
{
|
||||
"variants": {
|
||||
"facing=down": { "model": "observer", "x": 90 },
|
||||
"facing=up": { "model": "observer", "x": 270 },
|
||||
"facing=north": { "model": "observer" },
|
||||
"facing=south": { "model": "observer", "y": 180 },
|
||||
"facing=west": { "model": "observer", "y": 270 },
|
||||
"facing=east": { "model": "observer", "y": 90 }
|
||||
"facing=up,powered=false": { "model": "observer", "x": 270 },
|
||||
"facing=down,powered=false": { "model": "observer", "x": 90 },
|
||||
"facing=north,powered=false": { "model": "observer" },
|
||||
"facing=south,powered=false": { "model": "observer", "y": 180 },
|
||||
"facing=west,powered=false": { "model": "observer", "y": 270 },
|
||||
"facing=east,powered=false": { "model": "observer", "y": 90 },
|
||||
"facing=up,powered=true": { "model": "observer_powered", "x": 270 },
|
||||
"facing=down,powered=true": { "model": "observer_powered", "x": 90 },
|
||||
"facing=north,powered=true": { "model": "observer_powered" },
|
||||
"facing=south,powered=true": { "model": "observer_powered", "y": 180 },
|
||||
"facing=west,powered=true": { "model": "observer_powered", "y": 270 },
|
||||
"facing=east,powered=true": { "model": "observer_powered", "y": 90 }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -439,6 +439,8 @@ difficulty.lock.question=Are you sure you want to lock the difficulty of this wo
|
||||
|
||||
title.oldgl1=Old graphics card detected; this may prevent you from
|
||||
title.oldgl2=playing in the future as OpenGL 2.0 will be required.
|
||||
title.oldjava1=Old java detected; this will prevent you from playing
|
||||
title.oldjava2=in the future as Java 8 will be required.
|
||||
|
||||
controls.title=Controls
|
||||
controls.reset=Reset
|
||||
@@ -714,7 +716,7 @@ tile.woolCarpet.yellow.name=Yellow Carpet
|
||||
tile.woolCarpet.lightBlue.name=Light Blue Carpet
|
||||
tile.woolCarpet.magenta.name=Magenta Carpet
|
||||
tile.woolCarpet.orange.name=Orange Carpet
|
||||
tile.woolCarpet.white.name=Carpet
|
||||
tile.woolCarpet.white.name=White Carpet
|
||||
tile.ice.name=Ice
|
||||
tile.frostedIce.name=Frosted Ice
|
||||
tile.icePacked.name=Packed Ice
|
||||
@@ -774,7 +776,7 @@ tile.cloth.yellow.name=Yellow Wool
|
||||
tile.cloth.lightBlue.name=Light Blue Wool
|
||||
tile.cloth.magenta.name=Magenta Wool
|
||||
tile.cloth.orange.name=Orange Wool
|
||||
tile.cloth.white.name=Wool
|
||||
tile.cloth.white.name=White Wool
|
||||
tile.oreLapis.name=Lapis Lazuli Ore
|
||||
tile.blockLapis.name=Lapis Lazuli Block
|
||||
tile.dispenser.name=Dispenser
|
||||
@@ -1069,6 +1071,8 @@ item.blazeRod.name=Blaze Rod
|
||||
item.ghastTear.name=Ghast Tear
|
||||
item.netherStalkSeeds.name=Nether Wart
|
||||
item.potion.name=Potion
|
||||
item.splash_potion.name=Splash Potion
|
||||
item.lingering_potion.name=Lingering Potion
|
||||
item.end_crystal.name=End Crystal
|
||||
item.goldNugget.name=Gold Nugget
|
||||
item.glassBottle.name=Glass Bottle
|
||||
@@ -1149,6 +1153,7 @@ item.dragon_breath.name=Dragon's Breath
|
||||
item.elytra.name=Elytra
|
||||
item.totem.name=Totem of Undying
|
||||
item.shulkerShell.name=Shulker Shell
|
||||
item.ironNugget.name=Iron Nugget
|
||||
|
||||
container.inventory=Inventory
|
||||
container.hopper=Item Hopper
|
||||
@@ -1172,7 +1177,7 @@ container.chestDouble=Large Chest
|
||||
container.enderchest=Ender Chest
|
||||
container.beacon=Beacon
|
||||
container.shulkerBox=Shulker Box
|
||||
container.shulkerBox.more=and %d more...
|
||||
container.shulkerBox.more=and %s more...
|
||||
|
||||
container.spectatorCantOpen=Unable to open. Loot not generated yet.
|
||||
container.isLocked=%s is locked!
|
||||
@@ -1360,6 +1365,7 @@ death.attack.fall=%1$s hit the ground too hard
|
||||
death.attack.outOfWorld=%1$s fell out of the world
|
||||
death.attack.dragonBreath=%1$s was roasted in dragon breath
|
||||
death.attack.flyIntoWall=%1$s experienced kinetic energy
|
||||
death.attack.fireworks=%1$s went off with a bang
|
||||
|
||||
deathScreen.respawn=Respawn
|
||||
deathScreen.spectate=Spectate world
|
||||
@@ -1495,6 +1501,7 @@ enchantment.damage.undead=Smite
|
||||
enchantment.damage.arthropods=Bane of Arthropods
|
||||
enchantment.knockback=Knockback
|
||||
enchantment.fire=Fire Aspect
|
||||
enchantment.sweeping=Sweeping Edge
|
||||
enchantment.protect.all=Protection
|
||||
enchantment.protect.fire=Fire Protection
|
||||
enchantment.protect.fall=Feather Falling
|
||||
@@ -1939,6 +1946,7 @@ commands.scoreboard.players.tag.notFound=Entity didn't have the %s tag
|
||||
commands.scoreboard.players.tag.success.add=Tag %s added
|
||||
commands.scoreboard.players.tag.success.remove=Tag %s removed
|
||||
commands.scoreboard.players.tag.list=Tags on entity %s are:
|
||||
commands.scoreboard.players.tag.tagError=Players tag command failed, reason: %s
|
||||
commands.scoreboard.teams.usage=/scoreboard teams <list|add|remove|empty|join|leave|option> ...
|
||||
commands.scoreboard.teams.add.usage=/scoreboard teams add <name> [display name ...]
|
||||
commands.scoreboard.teams.add.alreadyExists=A team with the name '%s' already exists
|
||||
@@ -2067,7 +2075,7 @@ commands.worldborder.warning.time.usage=/worldborder warning time <seconds>
|
||||
commands.worldborder.warning.time.success=Set world border warning to %s seconds away (from %s seconds)
|
||||
commands.worldborder.warning.distance.usage=/worldborder warning distance <distance>
|
||||
commands.worldborder.warning.distance.success=Set world border warning to %s blocks away (from %s blocks)
|
||||
commands.title.usage=/title <player> <title|subtitle|actionbar|clear|reset|times> ...
|
||||
commands.title.usage=/title <player> title|subtitle|actionbar|clear|reset|times ...
|
||||
commands.title.usage.title=/title <player> title|subtitle|actionbar <raw json title>
|
||||
commands.title.usage.clear=/title <player> clear|reset
|
||||
commands.title.usage.times=/title <player> times <fadeIn> <stay> <fadeOut>
|
||||
@@ -2078,7 +2086,7 @@ commands.stopsound.success.individualSound=Stopped sound '%s' with source '%s' f
|
||||
commands.stopsound.success.soundSource=Stopped source '%s' for %s
|
||||
commands.stopsound.success.all=Stopped all sounds for %s
|
||||
commands.locate.usage=/locate <feature>
|
||||
commands.locate.success=Located %s at %d (y?) %d
|
||||
commands.locate.success=Located %s at %s (y?) %s
|
||||
commands.locate.failure=Unable to locate any %s feature
|
||||
|
||||
itemGroup.buildingBlocks=Building Blocks
|
||||
@@ -2860,7 +2868,7 @@ subtitles.block.iron_trapdoor.open=Trapdoor closes
|
||||
subtitles.block.lava.ambient=Lava pops
|
||||
subtitles.block.lava.extinguish=Lava hisses
|
||||
subtitles.block.lever.click=Lever clicks
|
||||
subtitles.block.note.note=Note block plays
|
||||
subtitles.block.note.note=Note Block plays
|
||||
subtitles.block.piston.move=Piston moves
|
||||
subtitles.block.portal.ambient=Portal whooshes
|
||||
subtitles.block.pressure_plate.click=Pressure Plate clicks
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
"entries": [
|
||||
{
|
||||
"type": "item",
|
||||
"name": "minecraft:totem"
|
||||
"name": "minecraft:totem_of_undying"
|
||||
}
|
||||
]
|
||||
},
|
||||
@@ -39,6 +39,6 @@
|
||||
"condition": "killed_by_player"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
6
assets/minecraft/models/block/observer_powered.json
Normal file
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "block/observer",
|
||||
"textures": {
|
||||
"bottom": "blocks/observer_back_lit"
|
||||
}
|
||||
}
|
||||
@@ -20,6 +20,10 @@
|
||||
"rotation": [ 0, -90, 25 ],
|
||||
"translation": [ 1.13, 3.2, 1.13],
|
||||
"scale": [ 0.68, 0.68, 0.68 ]
|
||||
},
|
||||
"fixed": {
|
||||
"rotation": [ 0, 180, 0 ],
|
||||
"scale": [ 1, 1, 1 ]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
6
assets/minecraft/models/item/iron_nugget.json
Normal file
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "items/iron_nugget"
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,7 @@
|
||||
"parent": "builtin/entity",
|
||||
"display": {
|
||||
"gui": {
|
||||
"rotation": [ 30, 225, 0 ],
|
||||
"rotation": [ 30, 45, 0 ],
|
||||
"translation": [ 0, 3, 0 ],
|
||||
"scale": [ 1, 1, 1 ]
|
||||
},
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
"display": {
|
||||
"gui": {
|
||||
"translation": [ -2, 2, 0 ],
|
||||
"rotation": [ 30, -135, 0 ],
|
||||
"rotation": [ 30, 45, 0 ],
|
||||
"scale": [ 0.6, 0.6, 0.6 ]
|
||||
}
|
||||
}
|
||||
|
||||
|
Before Width: | Height: | Size: 465 B After Width: | Height: | Size: 394 B |
|
Before Width: | Height: | Size: 347 B After Width: | Height: | Size: 289 B |
|
Before Width: | Height: | Size: 649 B After Width: | Height: | Size: 591 B |
|
Before Width: | Height: | Size: 219 B After Width: | Height: | Size: 147 B |
|
Before Width: | Height: | Size: 479 B After Width: | Height: | Size: 408 B |
|
Before Width: | Height: | Size: 403 B After Width: | Height: | Size: 331 B |
|
Before Width: | Height: | Size: 558 B After Width: | Height: | Size: 501 B |
|
Before Width: | Height: | Size: 530 B After Width: | Height: | Size: 473 B |
|
Before Width: | Height: | Size: 512 B After Width: | Height: | Size: 455 B |
|
Before Width: | Height: | Size: 548 B After Width: | Height: | Size: 491 B |
|
Before Width: | Height: | Size: 766 B After Width: | Height: | Size: 695 B |
|
Before Width: | Height: | Size: 750 B After Width: | Height: | Size: 679 B |
|
Before Width: | Height: | Size: 692 B After Width: | Height: | Size: 621 B |
|
Before Width: | Height: | Size: 310 B After Width: | Height: | Size: 239 B |
|
Before Width: | Height: | Size: 668 B After Width: | Height: | Size: 596 B |
|
Before Width: | Height: | Size: 565 B After Width: | Height: | Size: 508 B |
|
Before Width: | Height: | Size: 528 B After Width: | Height: | Size: 471 B |
|
Before Width: | Height: | Size: 505 B After Width: | Height: | Size: 448 B |
|
Before Width: | Height: | Size: 545 B After Width: | Height: | Size: 488 B |
|
Before Width: | Height: | Size: 449 B After Width: | Height: | Size: 410 B |
|
Before Width: | Height: | Size: 452 B After Width: | Height: | Size: 413 B |
|
Before Width: | Height: | Size: 219 B After Width: | Height: | Size: 148 B |
|
Before Width: | Height: | Size: 177 B After Width: | Height: | Size: 138 B |
|
Before Width: | Height: | Size: 224 B After Width: | Height: | Size: 185 B |
|
Before Width: | Height: | Size: 632 B After Width: | Height: | Size: 560 B |
|
Before Width: | Height: | Size: 377 B After Width: | Height: | Size: 269 B |
|
Before Width: | Height: | Size: 482 B After Width: | Height: | Size: 429 B |
|
Before Width: | Height: | Size: 687 B After Width: | Height: | Size: 634 B |
|
Before Width: | Height: | Size: 574 B After Width: | Height: | Size: 535 B |
|
Before Width: | Height: | Size: 596 B After Width: | Height: | Size: 543 B |
|
Before Width: | Height: | Size: 578 B After Width: | Height: | Size: 525 B |
|
Before Width: | Height: | Size: 639 B After Width: | Height: | Size: 586 B |
|
Before Width: | Height: | Size: 672 B After Width: | Height: | Size: 619 B |
|
Before Width: | Height: | Size: 598 B After Width: | Height: | Size: 545 B |
|
Before Width: | Height: | Size: 593 B After Width: | Height: | Size: 540 B |
|
Before Width: | Height: | Size: 398 B After Width: | Height: | Size: 345 B |
|
Before Width: | Height: | Size: 417 B After Width: | Height: | Size: 364 B |
|
Before Width: | Height: | Size: 414 B After Width: | Height: | Size: 344 B |
|
Before Width: | Height: | Size: 388 B After Width: | Height: | Size: 318 B |
|
Before Width: | Height: | Size: 456 B After Width: | Height: | Size: 403 B |
|
Before Width: | Height: | Size: 436 B After Width: | Height: | Size: 383 B |
|
Before Width: | Height: | Size: 486 B After Width: | Height: | Size: 415 B |
|
Before Width: | Height: | Size: 458 B After Width: | Height: | Size: 387 B |
|
Before Width: | Height: | Size: 420 B After Width: | Height: | Size: 349 B |
|
Before Width: | Height: | Size: 413 B After Width: | Height: | Size: 342 B |
|
Before Width: | Height: | Size: 499 B After Width: | Height: | Size: 428 B |
|
Before Width: | Height: | Size: 391 B After Width: | Height: | Size: 320 B |
|
Before Width: | Height: | Size: 287 B After Width: | Height: | Size: 234 B |
|
Before Width: | Height: | Size: 412 B After Width: | Height: | Size: 359 B |
|
Before Width: | Height: | Size: 324 B After Width: | Height: | Size: 271 B |
|
Before Width: | Height: | Size: 400 B After Width: | Height: | Size: 347 B |
|
Before Width: | Height: | Size: 445 B After Width: | Height: | Size: 392 B |
|
Before Width: | Height: | Size: 428 B After Width: | Height: | Size: 357 B |
|
Before Width: | Height: | Size: 531 B After Width: | Height: | Size: 492 B |
|
Before Width: | Height: | Size: 540 B After Width: | Height: | Size: 501 B |
|
Before Width: | Height: | Size: 632 B After Width: | Height: | Size: 579 B |
|
Before Width: | Height: | Size: 324 B After Width: | Height: | Size: 253 B |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 360 B After Width: | Height: | Size: 307 B |
|
Before Width: | Height: | Size: 401 B After Width: | Height: | Size: 348 B |
|
Before Width: | Height: | Size: 387 B After Width: | Height: | Size: 334 B |
|
Before Width: | Height: | Size: 392 B After Width: | Height: | Size: 339 B |
|
Before Width: | Height: | Size: 373 B After Width: | Height: | Size: 320 B |
|
Before Width: | Height: | Size: 261 B After Width: | Height: | Size: 190 B |
|
Before Width: | Height: | Size: 422 B After Width: | Height: | Size: 369 B |
|
Before Width: | Height: | Size: 413 B After Width: | Height: | Size: 360 B |
|
Before Width: | Height: | Size: 410 B After Width: | Height: | Size: 357 B |
|
Before Width: | Height: | Size: 413 B After Width: | Height: | Size: 360 B |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 179 B |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 193 B |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 210 B |
|
Before Width: | Height: | Size: 192 B After Width: | Height: | Size: 121 B |
|
Before Width: | Height: | Size: 272 B After Width: | Height: | Size: 201 B |
|
Before Width: | Height: | Size: 477 B After Width: | Height: | Size: 406 B |
|
Before Width: | Height: | Size: 867 B After Width: | Height: | Size: 796 B |
|
Before Width: | Height: | Size: 622 B After Width: | Height: | Size: 551 B |
|
Before Width: | Height: | Size: 421 B After Width: | Height: | Size: 350 B |
|
Before Width: | Height: | Size: 461 B After Width: | Height: | Size: 390 B |
|
Before Width: | Height: | Size: 456 B After Width: | Height: | Size: 385 B |
|
Before Width: | Height: | Size: 515 B After Width: | Height: | Size: 444 B |
|
Before Width: | Height: | Size: 422 B After Width: | Height: | Size: 351 B |
|
Before Width: | Height: | Size: 465 B After Width: | Height: | Size: 394 B |
|
Before Width: | Height: | Size: 476 B After Width: | Height: | Size: 405 B |
|
Before Width: | Height: | Size: 532 B After Width: | Height: | Size: 461 B |
|
Before Width: | Height: | Size: 538 B After Width: | Height: | Size: 467 B |
|
Before Width: | Height: | Size: 534 B After Width: | Height: | Size: 463 B |
|
Before Width: | Height: | Size: 548 B After Width: | Height: | Size: 477 B |
|
Before Width: | Height: | Size: 547 B After Width: | Height: | Size: 476 B |
|
Before Width: | Height: | Size: 535 B After Width: | Height: | Size: 464 B |
|
Before Width: | Height: | Size: 492 B After Width: | Height: | Size: 421 B |