Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

asteroid dimension #320

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open
7 changes: 7 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ val jeiVersion = project.property("jei.version").toString()
val badpacketsVersion = project.property("badpackets.version").toString()
val wthitVersion = project.property("wthit.version").toString()
val architecturyVersion = project.property("architectury.version").toString()
val appleskinVersion = project.property("appleskin.version").toString()
val objVersion = project.property("obj.version").toString()

plugins {
Expand Down Expand Up @@ -191,6 +192,11 @@ repositories {
includeGroup("mezz.jei")
}
}
maven("https://maven.ryanliptak.com/") {
content {
includeGroup("squeek.appleskin")
}
}
}

configurations {
Expand Down Expand Up @@ -230,6 +236,7 @@ dependencies {
"compat"("me.shedaniel.cloth:cloth-config-fabric:$clothConfigVersion")
"compat"("mcp.mobius.waila:wthit:fabric-$wthitVersion")
"compat"("dev.architectury:architectury-fabric:$architecturyVersion") // required for REI fluid support
"compat"("squeek.appleskin:appleskin-fabric:$appleskinVersion")

multicompat(group = "me.shedaniel",
api = "RoughlyEnoughItems-api-fabric",
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ badpackets.version=0.6.1
wthit.version=10.4.0
obj.version=0.4.0
architectury.version=11.1.17
appleskin.version=mc1.20.3-2.5.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"variants": {
"": {
"model": "galacticraft:block/air_lock_seal"
}
"facing=north": { "model": "galacticraft:block/air_lock_seal", "y": 90, "uvlock": true },
"facing=east": { "model": "galacticraft:block/air_lock_seal", "uvlock": true },
"facing=south": { "model": "galacticraft:block/air_lock_seal", "y": 90, "uvlock": true },
"facing=west": { "model": "galacticraft:block/air_lock_seal", "uvlock": true },
"facing=up": { "model": "galacticraft:block/air_lock_seal", "x": 90, "uvlock": true },
"facing=down": { "model": "galacticraft:block/air_lock_seal", "x": 90, "uvlock": true }
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "galacticraft:block/mars_copper_ore"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "galacticraft:block/mars_iron_ore"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "galacticraft:block/mars_tin_ore"
}
}
}
13 changes: 6 additions & 7 deletions src/main/generated/assets/galacticraft/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
"block.galacticraft.aluminum_decoration_stairs": "Aluminum Decoration Stairs",
"block.galacticraft.aluminum_decoration_wall": "Aluminum Decoration Wall",
"block.galacticraft.aluminum_ore": "Aluminum Ore",
"block.galacticraft.mars_iron_ore": "Mars Iron Ore",
"block.galacticraft.mars_copper_ore": "Mars Copper Ore",
"block.galacticraft.mars_tin_ore": "Mars Tin Ore",
"block.galacticraft.aluminum_wire": "Aluminum Wire",
"block.galacticraft.asteroid_rock": "Asteroid Rock",
"block.galacticraft.asteroid_rock_block_1": "Asteroid Rock",
Expand Down Expand Up @@ -348,11 +351,6 @@
"item.galacticraft.blue_solar_wafer": "Blue Solar Wafer",
"item.galacticraft.brown_parachute": "Brown Parachute",
"item.galacticraft.burger_bun": "Burger Bun",
"item.galacticraft.canned_beef": "Canned Beef",
"item.galacticraft.canned_dehydrated_apple": "Canned Dehydrated Apple",
"item.galacticraft.canned_dehydrated_carrot": "Canned Dehydrated Carrot",
"item.galacticraft.canned_dehydrated_melon": "Canned Dehydrated Melon",
"item.galacticraft.canned_dehydrated_potato": "Canned Dehydrated Potato",
"item.galacticraft.canvas": "Canvas",
"item.galacticraft.carbon_fragments": "Carbon Fragments",
"item.galacticraft.cargo_rocket_schematic": "Cargo Rocket Schematic",
Expand Down Expand Up @@ -460,6 +458,7 @@
"item.galacticraft.tier_2_rocket_schematic": "Tier 2 Rocket Schematic",
"item.galacticraft.tier_3_rocket_schematic": "Tier 3 Rocket Schematic",
"item.galacticraft.tin_canister": "Tin Canister",
"item.galacticraft.empty_food_can": "Empty Food Can",
"item.galacticraft.tin_ingot": "Tin Ingot",
"item.galacticraft.tin_nugget": "Tin Nugget",
"item.galacticraft.titanium_axe": "Titanium Axe",
Expand All @@ -481,8 +480,8 @@
"itemGroup.galacticraft.machines": "Galacticraft Machines",
"key.galacticraft.open_celestial_screen": "Open Celestial Map",
"key.galacticraft.rocket.inventory": "Open Rocket Inventory",
"planet.galacticraft.asteroids": "Asteroids",
"planet.galacticraft.asteroids.description": "",
"planet.galacticraft.asteroid": "Asteroids",
"planet.galacticraft.asteroid.description": "",
"planet.galacticraft.earth": "Earth",
"planet.galacticraft.earth.description": "The Overworld",
"planet.galacticraft.jupiter": "Jupiter",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "galacticraft:block/mars_copper_ore"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "galacticraft:block/mars_iron_ore"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "galacticraft:block/mars_tin_ore"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"parent": "minecraft:block/cube_top",
"textures": {
"side": "galacticraft:block/soft_venus_rock",
"top": "galacticraft:block/vapor_spout"
"top": "galacticraft:block/vapor_spout_block_top"
}
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "galacticraft:item/canned_food_template",
"layer1": "galacticraft:item/canned_food_label"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "galacticraft:item/canned_food_template",
"layer1": "galacticraft:item/canned_food_label"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "galacticraft:block/mars_copper_ore"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "galacticraft:block/mars_iron_ore"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "galacticraft:block/mars_tin_ore"
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading