-
Notifications
You must be signed in to change notification settings - Fork 433
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3975 from webbukkit/v3.0
v3.6-beta-1
- Loading branch information
Showing
147 changed files
with
8,655 additions
and
104 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
{ | ||
"java.configuration.updateBuildConfiguration": "automatic" | ||
"java.configuration.updateBuildConfiguration": "automatic", | ||
"java.compile.nullAnalysis.mode": "automatic" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+194 Bytes
...s/standard/assets/minecraft/textures/block/calibrated_sculk_sensor_amethyst.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 added
BIN
+284 Bytes
...standard/assets/minecraft/textures/block/calibrated_sculk_sensor_input_side.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 added
BIN
+256 Bytes
...epacks/standard/assets/minecraft/textures/block/calibrated_sculk_sensor_top.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
BIN
-13 Bytes
(86%)
...rces/texturepacks/standard/assets/minecraft/textures/block/pink_petals_stem.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 added
BIN
+159 Bytes
...s/texturepacks/standard/assets/minecraft/textures/block/pitcher_crop_bottom.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 added
BIN
+160 Bytes
...epacks/standard/assets/minecraft/textures/block/pitcher_crop_bottom_stage_1.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 added
BIN
+206 Bytes
...epacks/standard/assets/minecraft/textures/block/pitcher_crop_bottom_stage_2.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 added
BIN
+190 Bytes
...epacks/standard/assets/minecraft/textures/block/pitcher_crop_bottom_stage_3.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 added
BIN
+201 Bytes
...epacks/standard/assets/minecraft/textures/block/pitcher_crop_bottom_stage_4.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 added
BIN
+168 Bytes
...ces/texturepacks/standard/assets/minecraft/textures/block/pitcher_crop_side.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 added
BIN
+185 Bytes
...rces/texturepacks/standard/assets/minecraft/textures/block/pitcher_crop_top.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 added
BIN
+203 Bytes
...turepacks/standard/assets/minecraft/textures/block/pitcher_crop_top_stage_3.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 added
BIN
+235 Bytes
...turepacks/standard/assets/minecraft/textures/block/pitcher_crop_top_stage_4.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
BIN
-5 Bytes
(98%)
...turepacks/standard/assets/minecraft/textures/block/purple_glazed_terracotta.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 added
BIN
+207 Bytes
...cks/standard/assets/minecraft/textures/block/sniffer_egg_not_cracked_bottom.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 added
BIN
+263 Bytes
...packs/standard/assets/minecraft/textures/block/sniffer_egg_not_cracked_east.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 added
BIN
+305 Bytes
...acks/standard/assets/minecraft/textures/block/sniffer_egg_not_cracked_north.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 added
BIN
+295 Bytes
...acks/standard/assets/minecraft/textures/block/sniffer_egg_not_cracked_south.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 added
BIN
+229 Bytes
...epacks/standard/assets/minecraft/textures/block/sniffer_egg_not_cracked_top.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 added
BIN
+269 Bytes
...packs/standard/assets/minecraft/textures/block/sniffer_egg_not_cracked_west.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 added
BIN
+222 Bytes
...tandard/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_bottom.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 added
BIN
+301 Bytes
.../standard/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_east.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 added
BIN
+350 Bytes
...standard/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_north.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 added
BIN
+331 Bytes
...standard/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_south.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 added
BIN
+275 Bytes
...s/standard/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_top.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 added
BIN
+312 Bytes
.../standard/assets/minecraft/textures/block/sniffer_egg_slightly_cracked_west.png
Oops, something went wrong.
Binary file added
BIN
+232 Bytes
...ks/standard/assets/minecraft/textures/block/sniffer_egg_very_cracked_bottom.png
Oops, something went wrong.
Binary file added
BIN
+323 Bytes
...acks/standard/assets/minecraft/textures/block/sniffer_egg_very_cracked_east.png
Oops, something went wrong.
Binary file added
BIN
+365 Bytes
...cks/standard/assets/minecraft/textures/block/sniffer_egg_very_cracked_north.png
Oops, something went wrong.
Binary file added
BIN
+353 Bytes
...cks/standard/assets/minecraft/textures/block/sniffer_egg_very_cracked_south.png
Oops, something went wrong.
Binary file added
BIN
+289 Bytes
...packs/standard/assets/minecraft/textures/block/sniffer_egg_very_cracked_top.png
Oops, something went wrong.
Binary file added
BIN
+332 Bytes
...acks/standard/assets/minecraft/textures/block/sniffer_egg_very_cracked_west.png
Oops, something went wrong.
Binary file added
BIN
+293 Bytes
...s/texturepacks/standard/assets/minecraft/textures/block/suspicious_gravel_0.png
Oops, something went wrong.
Binary file added
BIN
+302 Bytes
...s/texturepacks/standard/assets/minecraft/textures/block/suspicious_gravel_1.png
Oops, something went wrong.
Binary file added
BIN
+302 Bytes
...s/texturepacks/standard/assets/minecraft/textures/block/suspicious_gravel_2.png
Oops, something went wrong.
Binary file added
BIN
+295 Bytes
...s/texturepacks/standard/assets/minecraft/textures/block/suspicious_gravel_3.png
Oops, something went wrong.
Binary file modified
BIN
-154 Bytes
(64%)
...resources/texturepacks/standard/assets/minecraft/textures/block/torchflower.png
Oops, something went wrong.
Binary file modified
BIN
-62 Bytes
(68%)
...xturepacks/standard/assets/minecraft/textures/block/torchflower_crop_stage0.png
Oops, something went wrong.
Binary file modified
BIN
-111 Bytes
(64%)
...xturepacks/standard/assets/minecraft/textures/block/torchflower_crop_stage1.png
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.