Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 0 additions & 12 deletions assets/minecraft/blockstates/grass.json

This file was deleted.

12 changes: 12 additions & 0 deletions assets/minecraft/blockstates/short_grass.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"variants": {
"": [
{ "model": "block/short_grass", "weight": 5 },
{ "model": "unity:block/short_grass_alt", "weight": 7 },
{ "model": "unity:block/short_grass_alt2", "weight": 5 },
{ "model": "unity:block/short_grass_alt3", "weight": 3 },
{ "model": "unity:block/short_grass_alt4", "weight": 4 },
{ "model": "unity:block/short_grass_alt5", "weight": 6 }
]
}
}
1 change: 0 additions & 1 deletion assets/minecraft/particles/block.json

This file was deleted.

1 change: 0 additions & 1 deletion assets/minecraft/particles/elder_guardian.json

This file was deleted.

1 change: 0 additions & 1 deletion assets/minecraft/particles/explosion_emitter.json

This file was deleted.

1 change: 0 additions & 1 deletion assets/minecraft/particles/item.json

This file was deleted.

1 change: 0 additions & 1 deletion assets/minecraft/particles/item_slime.json

This file was deleted.

1 change: 0 additions & 1 deletion assets/minecraft/particles/item_snowball.json

This file was deleted.

Binary file modified assets/minecraft/textures/entity/bat.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/minecraft/textures/entity/boat/dark_oak.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/minecraft/textures/entity/boat/darkoak.png
Binary file not shown.
Binary file removed assets/minecraft/textures/font/unicode_page_fe.png
Diff not rendered.
Binary file removed assets/minecraft/textures/gui/accessibility.png
Diff not rendered.
Diff not rendered.
Binary file removed assets/minecraft/textures/gui/checkbox.png
Diff not rendered.
Binary file modified assets/minecraft/textures/gui/container/anvil.png
Binary file modified assets/minecraft/textures/gui/container/beacon.png
Binary file modified assets/minecraft/textures/gui/container/crafting_table.png
Binary file modified assets/minecraft/textures/gui/container/enchanting_table.png
Binary file modified assets/minecraft/textures/gui/container/grindstone.png
Binary file modified assets/minecraft/textures/gui/container/inventory.png
Binary file removed assets/minecraft/textures/gui/icons.png
Diff not rendered.
Binary file removed assets/minecraft/textures/gui/options_background.png
Diff not rendered.
Binary file removed assets/minecraft/textures/gui/recipe_button.png
Diff not rendered.
Binary file removed assets/minecraft/textures/gui/resource_packs.png
Diff not rendered.
Binary file removed assets/minecraft/textures/gui/server_selection.png
Diff not rendered.
Binary file modified assets/minecraft/textures/gui/sprites/advancements/title_box.png
Binary file modified assets/minecraft/textures/gui/sprites/container/anvil/error.png
Binary file modified assets/minecraft/textures/gui/sprites/container/beacon/button.png
Binary file modified assets/minecraft/textures/gui/sprites/container/beacon/cancel.png
Binary file modified assets/minecraft/textures/gui/sprites/container/beacon/confirm.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/air.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/air_bursting.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/armor_empty.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/armor_full.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/armor_half.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/effect_background.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/food_empty.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/food_empty_hunger.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/food_full.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/food_full_hunger.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/food_half.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/food_half_hunger.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/heart/container.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/heart/frozen_full.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/heart/frozen_half.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/heart/full.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/heart/half.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/heart/vehicle_full.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/heart/vehicle_half.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/hotbar.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/hotbar_selection.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/jump_bar_background.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/jump_bar_cooldown.png
Binary file modified assets/minecraft/textures/gui/sprites/hud/jump_bar_progress.png
Binary file modified assets/minecraft/textures/gui/sprites/icon/invite.png
Binary file modified assets/minecraft/textures/gui/sprites/icon/link.png
Binary file modified assets/minecraft/textures/gui/sprites/icon/link_highlighted.png
Binary file modified assets/minecraft/textures/gui/sprites/icon/news.png
Binary file modified assets/minecraft/textures/gui/sprites/icon/ping_1.png
Binary file modified assets/minecraft/textures/gui/sprites/icon/ping_2.png
Binary file modified assets/minecraft/textures/gui/sprites/icon/ping_3.png
Binary file modified assets/minecraft/textures/gui/sprites/icon/ping_4.png
Binary file modified assets/minecraft/textures/gui/sprites/icon/ping_5.png
Binary file modified assets/minecraft/textures/gui/sprites/icon/ping_unknown.png
Binary file modified assets/minecraft/textures/gui/sprites/icon/trial_available.png
Original file line number Diff line number Diff line change
@@ -1,31 +1,5 @@
{
"animation": {
"interpolate": true,
"frames": [
{
"index": 0,
"time": 10
},
{
"index": 1,
"time": 2
},
{
"index": 2,
"time": 2
},
{
"index": 3,
"time": 2
},
{
"index": 4,
"time": 2
},
{
"index": 5,
"time": 2
}
]
"frametime": 20
}
}
Binary file modified assets/minecraft/textures/gui/sprites/notification/1.png
Binary file modified assets/minecraft/textures/gui/sprites/notification/2.png
Binary file modified assets/minecraft/textures/gui/sprites/notification/3.png
Binary file modified assets/minecraft/textures/gui/sprites/notification/4.png
Binary file modified assets/minecraft/textures/gui/sprites/notification/5.png
Binary file modified assets/minecraft/textures/gui/sprites/notification/more.png
Binary file modified assets/minecraft/textures/gui/sprites/pending_invite/accept.png
Binary file modified assets/minecraft/textures/gui/sprites/pending_invite/reject.png
Binary file modified assets/minecraft/textures/gui/sprites/realm_status/closed.png
Binary file modified assets/minecraft/textures/gui/sprites/realm_status/expired.png
Binary file modified assets/minecraft/textures/gui/sprites/realm_status/open.png
Binary file modified assets/minecraft/textures/gui/sprites/recipe_book/button.png
Binary file modified assets/minecraft/textures/gui/sprites/server_list/join.png
Binary file modified assets/minecraft/textures/gui/sprites/server_list/move_down.png
Binary file modified assets/minecraft/textures/gui/sprites/server_list/move_up.png
Binary file modified assets/minecraft/textures/gui/sprites/server_list/ping_1.png
Binary file modified assets/minecraft/textures/gui/sprites/server_list/ping_2.png
Binary file modified assets/minecraft/textures/gui/sprites/server_list/ping_3.png
Binary file modified assets/minecraft/textures/gui/sprites/server_list/ping_4.png
Binary file modified assets/minecraft/textures/gui/sprites/server_list/ping_5.png
Binary file modified assets/minecraft/textures/gui/sprites/server_list/pinging_1.png
Binary file modified assets/minecraft/textures/gui/sprites/server_list/pinging_2.png
Binary file modified assets/minecraft/textures/gui/sprites/server_list/pinging_3.png
Binary file modified assets/minecraft/textures/gui/sprites/server_list/pinging_4.png
Binary file modified assets/minecraft/textures/gui/sprites/server_list/pinging_5.png
Binary file modified assets/minecraft/textures/gui/sprites/transferable_list/move_up.png
Binary file modified assets/minecraft/textures/gui/sprites/transferable_list/select.png
Binary file modified assets/minecraft/textures/gui/sprites/widget/button.png
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@
"type": "nine_slice",
"width": 200,
"height": 20,
"border": 3
"border": {
"left": 20,
"top": 4,
"right": 20,
"bottom": 4
}
}
}
}
Binary file modified assets/minecraft/textures/gui/sprites/widget/button_disabled.png
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@
"type": "nine_slice",
"width": 200,
"height": 20,
"border": 1
"border": {
"left": 20,
"top": 4,
"right": 20,
"bottom": 4
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@
"type": "nine_slice",
"width": 200,
"height": 20,
"border": 3
"border": {
"left": 20,
"top": 4,
"right": 20,
"bottom": 4
}
}
}
}
Binary file modified assets/minecraft/textures/gui/sprites/widget/checkbox.png
Binary file modified assets/minecraft/textures/gui/sprites/widget/checkbox_selected.png
Binary file modified assets/minecraft/textures/gui/sprites/widget/cross_button.png
Binary file modified assets/minecraft/textures/gui/sprites/widget/locked_button.png
Binary file modified assets/minecraft/textures/gui/sprites/widget/slot_frame.png
Binary file modified assets/minecraft/textures/gui/sprites/widget/unlocked_button.png
Binary file modified assets/minecraft/textures/gui/sprites/world_list/error.png
Binary file modified assets/minecraft/textures/gui/sprites/world_list/join.png
Binary file modified assets/minecraft/textures/gui/sprites/world_list/marked_join.png
Binary file modified assets/minecraft/textures/gui/sprites/world_list/warning.png
Binary file removed assets/minecraft/textures/gui/widgets.png
Diff not rendered.
Binary file removed assets/minecraft/textures/gui/world_selection.png
Diff not rendered.
Binary file added assets/minecraft/textures/map/decorations/frame.png
Binary file added assets/minecraft/textures/map/decorations/player.png
Binary file added assets/minecraft/textures/map/decorations/red_x.png
Binary file removed assets/minecraft/textures/map/map_icons.png
Diff not rendered.
Loading