Create/Update assets for version 1.7.2

assets/READ_ME_I_AM_VERY_IMPORTANT.txt

@@ -0,0 +1,16 @@
+ _    _  ___  ______ _   _ _____ _   _ _____ 
+| |  | |/ _ \ | ___ \ \ | |_   _| \ | |  __ \
+| |  | / /_\ \| |_/ /  \| | | | |  \| | |  \/
+| |/\| |  _  ||    /| . ` | | | | . ` | | __ 
+\  /\  / | | || |\ \| |\  |_| |_| |\  | |_\ \
+ \/  \/\_| |_/\_| \_\_| \_/\___/\_| \_/\____/
+
+(Sorry about the cheesy 90s ASCII art.)
+
+Everything in this folder that does not belong here will be deleted.
+This folder will be kept sync with the Launcher at every run.
+If you wish to modify assets/resources in any way, use Resource Packs.
+
+
+Ta,
+Dinnerbone of Mojang

assets/minecraft/lang/en_US.lang

@@ -20,7 +20,6 @@ translation.test.invalid2=hi %  s
 translation.test.args=%s %s
 translation.test.world=world
 
-menu.game=Game menu
 menu.singleplayer=Singleplayer
 menu.multiplayer=Multiplayer
 menu.online=Minecraft Realms
@@ -163,10 +162,7 @@ chat.copy=Copy to Clipboard
 chat.link.confirmTrusted=Do you want to open this link or copy it to your clipboard?
 chat.link.open=Open in browser
 
-chat.stream.text=(%s) <%s> %s
-chat.stream.emote=(%s) * %s %s
-
-menu.playdemo=Play Demo World
+$o=Play Demo World
 menu.resetdemo=Reset Demo World
 
 demo.day.1=This demo will last five game days, do your best!
@@ -218,8 +214,6 @@ soundCategory.player=Players
 soundCategory.block=Blocks
 soundCategory.ambient=Ambient/Environment
 
-record.nowPlaying=Now playing: %s
-
 options.off=OFF
 options.on=ON
 options.visible=Shown
@@ -228,7 +222,6 @@ options.title=Options
 options.controls=Controls...
 options.video=Video Settings...
 options.language=Language...
-options.stream=Broadcast Settings...
 options.sounds=Music & Sounds...
 options.sounds.title=Music & Sound Options
 options.languageWarning=Language translations may not be 100%% accurate
@@ -335,43 +328,10 @@ options.resourcepack=Resource Packs...
 options.fullscreen=Fullscreen
 options.vsync=Use VSync
 options.touchscreen=Touchscreen Mode
-
 options.mipmapLevels=Mipmap Levels
 options.anisotropicFiltering=Anisotropic Filtering
 options.forceUnicodeFont=Force Unicode Font
 
-options.stream.title=Twitch Broadcast Settings
-options.stream.bytesPerPixel=Quality
-options.stream.micVolumne=Mic Volume
-options.stream.micToggleBehavior=Push To
-options.stream.mic_toggle.mute=Mute
-options.stream.mic_toggle.talk=Talk
-options.stream.systemVolume=System Volume
-options.stream.kbps=Bandwidth
-options.stream.fps=Framerate
-options.stream.sendMetadata=Send Metadata
-options.stream.compression=Compression
-options.stream.compression.low=Low
-options.stream.compression.medium=Medium
-options.stream.compression.high=High
-options.stream.estimation=Estimated resolution: %dx%d
-options.stream.changes=You may need to restart your stream for these changes to take place.
-options.stream.ingestSelection=Broadcast Server List
-options.stream.ingest.title=Twitch Broadcast Servers
-options.stream.ingest.reset=Reset Preference
-options.stream.chat.title=Twitch Chat Settings
-options.stream.chat.enabled=Enable
-options.stream.chat.enabled.streaming=Whilst Streaming
-options.stream.chat.enabled.always=Always
-options.stream.chat.enabled.never=Never
-options.stream.chat.userFilter=User Filter
-options.stream.chat.userFilter.all=All Viewers
-options.stream.chat.userFilter.subs=Subscribers
-options.stream.chat.userFilter.mods=Moderators
-
-title.oldgl1="Old graphics card detected; this may prevent you from"
-title.oldgl2="playing in the far future as OpenGL 2.0 will be required."
-
 controls.title=Controls
 controls.reset=Reset
 controls.resetAll=Reset Keys
@@ -395,7 +355,6 @@ key.command=Open Command
 key.screenshot=Take Screenshot
 key.togglePerspective=Toggle Perspective
 key.smoothCamera=Toggle Cinematic Camera
-key.fullscreen=Toggle Fullscreen
 key.hotbar.1=Hotbar Slot 1
 key.hotbar.2=Hotbar Slot 2
 key.hotbar.3=Hotbar Slot 3
@@ -405,10 +364,6 @@ key.hotbar.6=Hotbar Slot 6
 key.hotbar.7=Hotbar Slot 7
 key.hotbar.8=Hotbar Slot 8
 key.hotbar.9=Hotbar Slot 9
-key.streamStartStop=Start/Stop Stream
-key.streamPauseUnpause=Pause/Unpause Stream
-key.streamCommercial=Show Stream Commercials
-key.streamToggleMic=Push To Talk/Mute
 
 key.categories.movement=Movement
 key.categories.misc=Miscellaneous
@@ -416,7 +371,6 @@ key.categories.multiplayer=Multiplayer
 key.categories.gameplay=Gameplay
 key.categories.ui=Game Interface
 key.categories.inventory=Inventory
-key.categories.stream=Streaming
 
 resourcePack.openFolder=Open resource pack folder
 resourcePack.title=Select Resource Packs
@@ -424,8 +378,6 @@ resourcePack.available.title=Available Resource Packs
 resourcePack.selected.title=Selected Resource Packs
 resourcePack.folderInfo=(Place resource pack files here)
 
-sign.edit=Edit sign message
-
 book.pageIndicator=Page %1$s of %2$s
 book.byAuthor=by %1$s
 book.signButton=Sign
@@ -1622,7 +1574,7 @@ mco.selectServer.configure=Configure
 mco.selectServer.leave=Leave Realm
 mco.selectServer.create=Create Realm
 mco.selectServer.buy=Buy Realm
-mco.selectServer.whatisrealms=What is Realms?
+mco.selectServer.moreinfo=More Info
 
 mco.selectServer.expired=Expired Server
 mco.selectServer.open=Open Server
@@ -1640,7 +1592,7 @@ mco.configure.world.name=Name
 mco.configure.world.description=Description
 mco.configure.world.location=Location
 mco.configure.world.invited=Invited
-mco.configure.world.buttons.edit=Edit Settings...
+mco.configure.world.buttons.edit=Edit
 mco.configure.world.buttons.reset=Reset Realm
 mco.configure.world.buttons.done=Done
 mco.configure.world.buttons.delete=Delete
@@ -1658,7 +1610,6 @@ mco.configure.world.subscription.title=Subscription Info
 mco.configure.world.subscription.daysleft=Days Left
 mco.configure.world.subscription.start=Start Date
 mco.configure.world.subscription.extend=Extend Subscription
-mco.configure.world.subscription.extendHere=Extend subscription here:
 
 mco.create.world.location.title=Locations
 mco.create.world.location.warning=You may not get the exact location you select
@@ -1732,55 +1683,3 @@ attribute.name.generic.attackDamage=Attack Damage
 
 screenshot.success=Saved screenshot as %s
 screenshot.failure=Couldn't save screenshot: %s
-
-stream.user.mode.moderator=Moderator
-stream.user.mode.moderator.self=Moderator on your channel
-stream.user.mode.moderator.other=Moderator on %s's channel
-stream.user.mode.broadcaster=Broadcaster
-stream.user.mode.broadcaster.self=Broadcaster (You!)
-stream.user.mode.broadcaster.other=Broadcaster
-stream.user.mode.administrator=Twitch Administrator
-stream.user.mode.staff=Twitch Staff
-stream.user.mode.banned=Banned
-stream.user.mode.banned.self=Banned on your channel
-stream.user.mode.banned.other=Banned on %s's channel
-stream.user.subscription.subscriber=Subscriber
-stream.user.subscription.subscriber.self=Subscriber to your channel
-stream.user.subscription.subscriber.other=Subscriber to %s's channel
-stream.user.subscription.turbo=Twitch Turbo
-
-stream.unavailable.title=Twitch Broadcasting Unavailable
-stream.unavailable.report_to_mojang=Report to Mojang
-
-stream.unavailable.account_not_bound=Before you can broadcast Minecraft through Twitch, you will need to link your Twitch account on mojang.com. Would you like to do that now?
-stream.unavailable.account_not_bound.okay=Link Accounts
-stream.unavailable.account_not_migrated=Before you can broadcast Minecraft through Twitch, you will need to migrate your Minecraft account to a Mojang account. Would you like to do that now?
-stream.unavailable.account_not_migrated.okay=Migrate Account
-stream.unavailable.failed_auth=Authentication to Twitch failed. Please go to mojang.com and rebind your Twitch account.
-stream.unavailable.failed_auth.okay=Rebind Accounts
-stream.unavailable.failed_auth_error=Unable to authenticate to Twitch. Please try again later.
-stream.unavailable.initialization_failure=Unable to initialize the Twitch SDK.
-stream.unavailable.initialization_failure.extra=(Reason: %s)
-stream.unavailable.library_arch_mismatch=The custom java version used to launch Minecraft has a different architecture than the one used to run the launcher. Please make sure these are the same, either 32-bit or 64-bit for both.
-stream.unavailable.library_failure=Unable to load the libraries needed for the integrated Twitch broadcasting service.
-stream.unavailable.no_fbo=Your video card needs to support at least OpenGL version 3.0 or support Framebuffer Objects via an extension to use the integrated Twitch broadcasting.
-stream.unavailable.no_fbo.version=You are currently using: %s
-stream.unavailable.no_fbo.blend=Separate blending support via EXT is: %s
-stream.unavailable.no_fbo.arb=Framebuffer object support via ARB is: %s
-stream.unavailable.no_fbo.ext=Framebuffer object support via EXT is: %s
-stream.unavailable.not_supported.windows=Unfortunately the integrated Twitch broadcasting requires a newer version of Windows than you are on. You must have at least Windows Vista or newer.
-stream.unavailable.not_supported.mac=Unfortunately the integrated Twitch broadcasting on Mac requires a version of OSX newer than the one you are on. You must use 10.7 (Mac OS X Lion) or newer to be able to use this service. Would you like to visit apple.com to learn about upgrading?
-stream.unavailable.not_supported.mac.okay=Upgrade
-stream.unavailable.not_supported.other=Unfortunately the integrated Twitch broadcasting service requires Windows (Vista or newer) or Mac OS X (10.7/Lion or newer)
-stream.unavailable.unknown=Unfortunately you cannot broadcast to Twitch at this time. And we don't know why :'(
-stream.unavailable.unknown.chat=Could not start stream: %s
-
-stream.unavailable.soundflower.chat=Soundflower is required to be able to stream on Mac. %s
-stream.unavailable.soundflower.chat.link=Please click here to install it.
-
-stream.userinfo.chatTooltip=Click to manage user
-stream.userinfo.timeout=Timeout
-stream.userinfo.ban=Ban
-stream.userinfo.unban=Unban
-stream.userinfo.mod=Promote to Moderator
-stream.userinfo.unmod=Demote from Moderator

assets/minecraft/shaders/post/notch.json

@@ -1,26 +0,0 @@
-{
-    "targets": [
-        "swap"
-    ],
-    "passes": [
-        {
-            "name": "notch",
-            "intarget": "minecraft:main",
-            "outtarget": "swap",
-            "auxtargets": [
-                {
-                    "name": "DitherSampler",
-                    "id": "dither",
-                    "width": 4,
-                    "height": 4,
-                    "bilinear": false
-                }
-            ]
-        },
-        {
-            "name": "blit",
-            "intarget": "swap",
-            "outtarget": "minecraft:main"
-        }
-    ]
-}

assets/minecraft/shaders/program/notch.fsh

@@ -1,23 +0,0 @@
-#version 120
-
-uniform sampler2D DiffuseSampler;
-uniform sampler2D DitherSampler;
-
-varying vec2 texCoord;
-
-uniform vec2 InSize;
-
-void main() {
-    vec2 halfSize = InSize * 0.5;
-    
-    vec2 steppedCoord = texCoord;
-    steppedCoord.x = float(int(steppedCoord.x*halfSize.x)) / halfSize.x;
-    steppedCoord.y = float(int(steppedCoord.y*halfSize.y)) / halfSize.y;
-    
-    vec4 noise = texture2D(DitherSampler, steppedCoord * halfSize / 4.0);
-    vec4 col = texture2D(DiffuseSampler, steppedCoord) + noise * vec4(1.0/12.0, 1.0/12.0, 1.0/6.0, 1.0);
-    float r = float(int(col.r*8.0))/8.0;
-    float g = float(int(col.g*8.0))/8.0;
-    float b = float(int(col.b*4.0))/4.0;
-    gl_FragColor = vec4(r, g, b, col.a);
-}

assets/minecraft/shaders/program/notch.json

@@ -1,19 +0,0 @@
-{
-    "blend": {
-        "func": "add",
-        "srcrgb": "one",
-        "dstrgb": "zero"
-    },
-    "vertex": "sobel",
-    "fragment": "notch",
-    "attributes": [ "Position" ],
-    "samplers": [
-        { "name": "DiffuseSampler" },
-        { "name": "DitherSampler" }
-    ],
-    "uniforms": [
-        { "name": "ProjMat",     "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
-        { "name": "InSize",      "type": "float",     "count": 2,  "values": [ 1.0, 1.0 ] },
-        { "name": "OutSize",     "type": "float",     "count": 2,  "values": [ 1.0, 1.0 ] }
-    ]
-}

assets/minecraft/texts/splashes.txt

@@ -224,7 +224,6 @@ It's groundbreaking!
 Let our battle's begin!
 The sky is the limit!
 Jeb has amazing hair!
-Ryan also has amazing hair!
 Casual gaming!
 Undefeated!
 Kinda like Lemmings!