Skip to content

Commit

Permalink
Merge pull request #228 from lumiscosity/more-tiles
Browse files Browse the repository at this point in the history
Badlands, dripstone caves and lush caves tiles + image compression
  • Loading branch information
sisby-folk authored Oct 1, 2024
2 parents c71293d + 30dd21e commit 1a09fa8
Show file tree
Hide file tree
Showing 277 changed files with 40 additions and 11 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"antique_atlas:tiling": {
"parent": "antique_atlas:base/sand"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"antique_atlas:tiling": {
"parent": "antique_atlas:base/sand"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"antique_atlas:tiling": {
"parent": "antique_atlas:base/sand"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"antique_atlas:tiling": {
"parent": "antique_atlas:base/cave"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"antique_atlas:tiling": {
"parent": "antique_atlas:base/cave"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"antique_atlas:tiling": {
"parent": "antique_atlas:base/cave"
}
}
Binary file modified src/main/resources/assets/antique_atlas/textures/gui/arrow.png
Binary file modified src/main/resources/assets/antique_atlas/textures/gui/book.png
10 changes: 5 additions & 5 deletions src/main/resources/assets/minecraft/atlas/biome/badlands.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"textures": {
"valley": [
"antique_atlas:biome/arid/desert/sand_1",
"antique_atlas:biome/arid/desert/sand_cacti_sparse",
"antique_atlas:biome/arid/desert/sand_shrubs"
],
"valley": {
"antique_atlas:biome/arid/badlands/desert/sand_1": 2,
"antique_atlas:biome/arid/badlands/desert/sand_cacti_sparse": 1,
"antique_atlas:biome/arid/badlands/desert/sand_shrubs": 4
},
"low": {
"antique_atlas:biome/arid/badlands/terracotta_shrubs_tiered": 4,
"antique_atlas:biome/arid/badlands/terracotta_tiered": 2,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"textures": [
"antique_atlas:feature/ravine/stone_ravine",
"antique_atlas:feature/ravine/andesite_ravine"
"antique_atlas:biome/cave/dripstone_caves"
]
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"textures": [
"antique_atlas:feature/ravine/stone_ravine",
"antique_atlas:feature/ravine/andesite_ravine"
]
"textures": {
"antique_atlas:biome/cave/lush_caves": 5,
"antique_atlas:biome/cave/lush_caves_aquifier": 1
}
}

0 comments on commit 1a09fa8

Please sign in to comment.