You've already forked minecraft-assets
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1e85337bfe |
@@ -404,7 +404,6 @@ options.vbo=Use VBOs
|
|||||||
options.touchscreen=Touchscreen Mode
|
options.touchscreen=Touchscreen Mode
|
||||||
options.blockAlternatives=Alternate Blocks
|
options.blockAlternatives=Alternate Blocks
|
||||||
options.reducedDebugInfo=Reduced Debug Info
|
options.reducedDebugInfo=Reduced Debug Info
|
||||||
options.entityShadows=Entity Shadows
|
|
||||||
|
|
||||||
options.mipmapLevels=Mipmap Levels
|
options.mipmapLevels=Mipmap Levels
|
||||||
options.forceUnicodeFont=Force Unicode Font
|
options.forceUnicodeFont=Force Unicode Font
|
||||||
@@ -752,7 +751,6 @@ tile.birchFenceGate.name=Birch Fence Gate
|
|||||||
tile.jungleFenceGate.name=Jungle Fence Gate
|
tile.jungleFenceGate.name=Jungle Fence Gate
|
||||||
tile.darkOakFenceGate.name=Dark Oak Fence Gate
|
tile.darkOakFenceGate.name=Dark Oak Fence Gate
|
||||||
tile.acaciaFenceGate.name=Acacia Fence Gate
|
tile.acaciaFenceGate.name=Acacia Fence Gate
|
||||||
tile.pumpkinStem.name=Pumpkin Stem
|
|
||||||
tile.pumpkin.name=Pumpkin
|
tile.pumpkin.name=Pumpkin
|
||||||
tile.litpumpkin.name=Jack o'Lantern
|
tile.litpumpkin.name=Jack o'Lantern
|
||||||
tile.hellrock.name=Netherrack
|
tile.hellrock.name=Netherrack
|
||||||
@@ -1132,7 +1130,6 @@ entity.Item.name=Item
|
|||||||
entity.XPOrb.name=Experience Orb
|
entity.XPOrb.name=Experience Orb
|
||||||
entity.SmallFireball.name=Small Fireball
|
entity.SmallFireball.name=Small Fireball
|
||||||
entity.Fireball.name=Fireball
|
entity.Fireball.name=Fireball
|
||||||
entity.ThrownPotion.name=Potion
|
|
||||||
|
|
||||||
entity.Arrow.name=Arrow
|
entity.Arrow.name=Arrow
|
||||||
entity.Snowball.name=Snowball
|
entity.Snowball.name=Snowball
|
||||||
@@ -1548,8 +1545,7 @@ commands.playsound.usage=/playsound <sound> <player> [x] [y] [z] [volume] [pitch
|
|||||||
commands.playsound.success=Played sound '%s' to %s
|
commands.playsound.success=Played sound '%s' to %s
|
||||||
commands.playsound.playerTooFar=Player %s is too far away to hear the sound
|
commands.playsound.playerTooFar=Player %s is too far away to hear the sound
|
||||||
commands.give.usage=/give <player> <item> [amount] [data] [dataTag]
|
commands.give.usage=/give <player> <item> [amount] [data] [dataTag]
|
||||||
commands.give.item.notFound=There is no such item with name %d
|
commands.give.notFound=There is no such item with name %d
|
||||||
commands.give.block.notFound=There is no such block with name %d
|
|
||||||
commands.give.success=Given %s * %d to %s
|
commands.give.success=Given %s * %d to %s
|
||||||
commands.give.tagError=Data tag parsing failed: %s
|
commands.give.tagError=Data tag parsing failed: %s
|
||||||
commands.replaceitem.usage=/replaceitem <entity|block> ...
|
commands.replaceitem.usage=/replaceitem <entity|block> ...
|
||||||
@@ -1595,7 +1591,7 @@ commands.fill.tagError=Data tag parsing failed: %s
|
|||||||
commands.fill.success=%d blocks filled
|
commands.fill.success=%d blocks filled
|
||||||
commands.fill.failed=No blocks filled
|
commands.fill.failed=No blocks filled
|
||||||
commands.fill.tooManyBlocks=Too many blocks in the specified area (%d > %d)
|
commands.fill.tooManyBlocks=Too many blocks in the specified area (%d > %d)
|
||||||
commands.clone.usage=/clone <x1> <y1> <z1> <x2> <y2> <z2> <x> <y> <z> [maskMode] [cloneMode]
|
commands.clone.usage=/clone <x1> <y1> <z1> <x2> <y2> <z2> <x> <y> <z> [mode]
|
||||||
commands.clone.outOfWorld=Cannot access blocks outside of the world
|
commands.clone.outOfWorld=Cannot access blocks outside of the world
|
||||||
commands.clone.noOverlap=Source and destination can not overlap
|
commands.clone.noOverlap=Source and destination can not overlap
|
||||||
commands.clone.success=%d blocks cloned
|
commands.clone.success=%d blocks cloned
|
||||||
@@ -1617,7 +1613,7 @@ commands.entitydata.success=Entity data updated to: %s
|
|||||||
commands.entitydata.tagError=Data tag parsing failed: %s
|
commands.entitydata.tagError=Data tag parsing failed: %s
|
||||||
commands.entitydata.noPlayers=%s is a player and cannot be changed
|
commands.entitydata.noPlayers=%s is a player and cannot be changed
|
||||||
commands.entitydata.failed=The data tag did not change: %s
|
commands.entitydata.failed=The data tag did not change: %s
|
||||||
commands.effect.usage=/effect <player> <effect> [seconds] [amplifier] [hideParticles] OR /effect <player> clear
|
commands.effect.usage=/effect <player> <effect> [seconds] [amplifier] [hideParticles]
|
||||||
commands.effect.notFound=There is no such mob effect with ID %d
|
commands.effect.notFound=There is no such mob effect with ID %d
|
||||||
commands.effect.success=Given %1$s (ID %2$d) * %3$d to %4$s for %5$d seconds
|
commands.effect.success=Given %1$s (ID %2$d) * %3$d to %4$s for %5$d seconds
|
||||||
commands.effect.success.removed=Took %1$s from %2$s
|
commands.effect.success.removed=Took %1$s from %2$s
|
||||||
@@ -1802,7 +1798,7 @@ commands.publish.failed=Unable to host local game
|
|||||||
commands.debug.start=Started debug profiling
|
commands.debug.start=Started debug profiling
|
||||||
commands.debug.stop=Stopped debug profiling after %.2f seconds (%d ticks)
|
commands.debug.stop=Stopped debug profiling after %.2f seconds (%d ticks)
|
||||||
commands.debug.notStarted=Can't stop profiling when we haven't started yet!
|
commands.debug.notStarted=Can't stop profiling when we haven't started yet!
|
||||||
commands.debug.usage=/debug <start|stop>
|
commands.debug.usage=/debug <start|stop|chunk> [<x> <y> <z>]
|
||||||
commands.chunkinfo.usage=/chunkinfo [<x> <y> <z>]
|
commands.chunkinfo.usage=/chunkinfo [<x> <y> <z>]
|
||||||
commands.chunkinfo.location=Chunk location: (%d, %d, %d)
|
commands.chunkinfo.location=Chunk location: (%d, %d, %d)
|
||||||
commands.chunkinfo.noChunk=No chunk found at chunk position %d, %d, %d
|
commands.chunkinfo.noChunk=No chunk found at chunk position %d, %d, %d
|
||||||
@@ -1859,7 +1855,7 @@ commands.achievement.give.success.one=Successfully given %s the stat %s
|
|||||||
commands.achievement.take.success.all=Successfully taken all achievements from %s
|
commands.achievement.take.success.all=Successfully taken all achievements from %s
|
||||||
commands.achievement.take.success.one=Successfully taken the stat %s from %s
|
commands.achievement.take.success.one=Successfully taken the stat %s from %s
|
||||||
commands.achievement.statTooLow=Player %s does not have the stat %s
|
commands.achievement.statTooLow=Player %s does not have the stat %s
|
||||||
commands.worldborder.usage=/worldborder <set|center|damage|warning|get|add> ...
|
commands.worldborder.usage=/worldborder <set|center|damage|warning|get> ...
|
||||||
commands.worldborder.add.usage=/worldborder add <sizeInBlocks> [timeInSeconds]
|
commands.worldborder.add.usage=/worldborder add <sizeInBlocks> [timeInSeconds]
|
||||||
commands.worldborder.set.usage=/worldborder set <sizeInBlocks> [timeInSeconds]
|
commands.worldborder.set.usage=/worldborder set <sizeInBlocks> [timeInSeconds]
|
||||||
commands.worldborder.set.success=Set world border to %s blocks wide (from %s blocks)
|
commands.worldborder.set.success=Set world border to %s blocks wide (from %s blocks)
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
},
|
},
|
||||||
"display": {
|
"display": {
|
||||||
"thirdperson": {
|
"thirdperson": {
|
||||||
"rotation": [ 5, 80, -45 ],
|
"rotation": [ 5, -100, -45 ],
|
||||||
"translation": [ 0.75, 0, 0.25 ],
|
"translation": [ 0.75, 0, 0.25 ],
|
||||||
"scale": [ 1, 1, 1 ]
|
"scale": [ 1, 1, 1 ]
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
},
|
},
|
||||||
"display": {
|
"display": {
|
||||||
"thirdperson": {
|
"thirdperson": {
|
||||||
"rotation": [ 5, 80, -45 ],
|
"rotation": [ 5, -100, -45 ],
|
||||||
"translation": [ 0.75, 0, 0.25 ],
|
"translation": [ 0.75, 0, 0.25 ],
|
||||||
"scale": [ 1, 1, 1 ]
|
"scale": [ 1, 1, 1 ]
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
},
|
},
|
||||||
"display": {
|
"display": {
|
||||||
"thirdperson": {
|
"thirdperson": {
|
||||||
"rotation": [ 5, 80, -45 ],
|
"rotation": [ 5, -100, -45 ],
|
||||||
"translation": [ 0.75, 0, 0.25 ],
|
"translation": [ 0.75, 0, 0.25 ],
|
||||||
"scale": [ 1, 1, 1 ]
|
"scale": [ 1, 1, 1 ]
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
},
|
},
|
||||||
"display": {
|
"display": {
|
||||||
"thirdperson": {
|
"thirdperson": {
|
||||||
"rotation": [ 5, 80, -45 ],
|
"rotation": [ 5, -100, -45 ],
|
||||||
"translation": [ 0.75, 0, 0.25 ],
|
"translation": [ 0.75, 0, 0.25 ],
|
||||||
"scale": [ 1, 1, 1 ]
|
"scale": [ 1, 1, 1 ]
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -7,5 +7,6 @@ uniform vec4 ColorModulate;
|
|||||||
varying vec2 texCoord;
|
varying vec2 texCoord;
|
||||||
|
|
||||||
void main(){
|
void main(){
|
||||||
gl_FragColor = texture2D(DiffuseSampler, texCoord) * ColorModulate;
|
vec4 outColor = texture2D(DiffuseSampler, texCoord) * ColorModulate;
|
||||||
|
gl_FragColor = vec4(outColor.rgb, 1.0);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,19 +13,11 @@ uniform float Radius;
|
|||||||
void main() {
|
void main() {
|
||||||
vec4 blurred = vec4(0.0);
|
vec4 blurred = vec4(0.0);
|
||||||
float totalStrength = 0.0;
|
float totalStrength = 0.0;
|
||||||
float totalAlpha = 0.0;
|
|
||||||
float totalSamples = 0.0;
|
|
||||||
for(float r = -Radius; r <= Radius; r += 1.0) {
|
for(float r = -Radius; r <= Radius; r += 1.0) {
|
||||||
vec4 sample = texture2D(DiffuseSampler, texCoord + oneTexel * r * BlurDir);
|
vec4 sample = texture2D(DiffuseSampler, texCoord + oneTexel * r * BlurDir);
|
||||||
|
|
||||||
// Accumulate average alpha
|
|
||||||
totalAlpha = totalAlpha + sample.a;
|
|
||||||
totalSamples = totalSamples + 1.0;
|
|
||||||
|
|
||||||
// Accumulate smoothed blur
|
|
||||||
float strength = 1.0 - abs(r / Radius);
|
float strength = 1.0 - abs(r / Radius);
|
||||||
totalStrength = totalStrength + strength;
|
totalStrength = totalStrength + strength;
|
||||||
blurred = blurred + sample;
|
blurred = blurred + sample * strength;
|
||||||
}
|
}
|
||||||
gl_FragColor = vec4(blurred.rgb / (Radius * 2.0 + 1.0), totalAlpha);
|
gl_FragColor = vec4(blurred.rgb / totalStrength, 1.0);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,5 +17,5 @@ void main(){
|
|||||||
float downDiff = abs(center.a - down.a);
|
float downDiff = abs(center.a - down.a);
|
||||||
float total = clamp(leftDiff + rightDiff + upDiff + downDiff, 0.0, 1.0);
|
float total = clamp(leftDiff + rightDiff + upDiff + downDiff, 0.0, 1.0);
|
||||||
vec3 outColor = center.rgb * center.a + left.rgb * left.a + right.rgb * right.a + up.rgb * up.a + down.rgb * down.a;
|
vec3 outColor = center.rgb * center.a + left.rgb * left.a + right.rgb * right.a + up.rgb * up.a + down.rgb * down.a;
|
||||||
gl_FragColor = vec4(outColor * 0.2, total);
|
gl_FragColor = vec4(outColor, total);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,8 +9,6 @@
|
|||||||
§f Markus Persson
|
§f Markus Persson
|
||||||
§f Jens Bergensten
|
§f Jens Bergensten
|
||||||
§f Nathan Adams
|
§f Nathan Adams
|
||||||
§f Ryan Holtz
|
|
||||||
§f Michael Stoyke
|
|
||||||
|
|
||||||
§7Programming:
|
§7Programming:
|
||||||
§f Erik Broes
|
§f Erik Broes
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
{
|
{
|
||||||
"id": "1.8.1",
|
"id": "1.8",
|
||||||
"type": "release",
|
"type": "release",
|
||||||
"url": "https://launchermeta.mojang.com/mc/game/d6614f2010cff434c1c51f00d03836846d74a442/1.8.1.json",
|
"url": "https://launchermeta.mojang.com/mc/game/d74a4b45e8877084e1bcc8121012845f28def238/1.8.json",
|
||||||
"time": "2016-06-01T11:45:48+00:00",
|
"time": "2016-06-01T11:45:48+00:00",
|
||||||
"releaseTime": "2014-11-24T14:13:31+00:00",
|
"releaseTime": "2014-09-02T08:24:35+00:00",
|
||||||
"downloadTimestamp": 1487424918910
|
"downloadTimestamp": 1487424953622
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user