Skip to content

Commit

Permalink
Tinkers contruct (real) (#189)
Browse files Browse the repository at this point in the history
* feat(mods): tinkers construct

* feat(recipes): moving stuff from metalurgy to tconstruct

* Tinkers update (#187)

* Fixes (#186)

* fix(recipes): backpack upgrades

* fix: stuff not working?

* revert(mods): rm teleporters and spawners (#183)

* feat(mods): modelfix (#182)

add modelfix to fix models.

* chore(packwiz): file stuff

someone forgor

* fix(recipes): tinker casting gears.

currently no copper gear is craftable.

* fix: rm duplicate fluids

* feat(recipes): cast in table to upgrade tiers

* chore(remove): goodbye metallurgy

* fix(world gen): I KILLED IT (tungsten)

---------

Co-authored-by: Sam <[email protected]>

* tungsten textures

* Remove metallurgy (#188)

* fix(ponder): rm metallurgy ponder

* chore(mods): packwiz index mod stuff

* fix: rm metallurgy recipe making stuff

* fix(recipes): backpack uses tconstruct brass.

* fix(recipes): fumo use tconstruct fluid

* fix(recipes): coal dust for cast iron

still need to add coal dust recipe.

* fix: tconstruct fluid instead of metallurgy.

* fix(recipes): tconstruct alloying

* feat(recipes): add back alloy mixing for early game.

* chore(unify): rm metallurgy from list

* fix(recipes): rm metallurgy recipes

* chore: rm metallurgy lang file

* chore: remove final metallurgy stuff.

* chore: update tinkers construct

* chore: mantle update

* chore: removals

* feature: world gen Silver/Nickel

* ignore update

* ignore packwiz update

* added casting helper functions

* updates / more helper functions

* fixes

* remove metallurgy complete

merge me

---------

Co-authored-by: Sam <[email protected]>

---------

Co-authored-by: Sam <[email protected]>
  • Loading branch information
Aiz0 and NotStargazer authored Jun 22, 2024
1 parent 89a04e4 commit b504926
Show file tree
Hide file tree
Showing 74 changed files with 761 additions and 775 deletions.
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
.vscode
reload.sh
reload.sh
kubejs/.idea
refresh.bat
reload.bat
serve.bat
update-fork.bat
8 changes: 7 additions & 1 deletion .packwizignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,10 @@
# probe stuff should not be necessary.
/kubejs/probe
# Aiz reload script
/reload.sh
/reload.sh
# Star's scripts
kubejs/.idea
refresh.bat
reload.bat
serve.bat
update-fork.bat
1 change: 0 additions & 1 deletion config/almostunified/unify.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"crafttweaker",
"create",
"thermal",
"createmetallurgy",
"immersiveengineering",
"mekanism",
"quark"
Expand Down
84 changes: 59 additions & 25 deletions index.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,39 @@ file = "config/zume.json5"
[[files]]
file = "defaultconfigs/create-server.toml"

[[files]]
file = "kubejs/.vscode/fluid-attributes.json"

[[files]]
file = "kubejs/.vscode/item-attributes.json"

[[files]]
file = "kubejs/.vscode/item-tag-attributes.json"

[[files]]
file = "kubejs/.vscode/lang-keys.json"

[[files]]
file = "kubejs/.vscode/probe.class-definitions.json"

[[files]]
file = "kubejs/.vscode/probe.code-snippets"

[[files]]
file = "kubejs/.vscode/probe.doc-schema.json"

[[files]]
file = "kubejs/.vscode/probe.lang-schema.json"

[[files]]
file = "kubejs/.vscode/probe.lang_key-definitions.json"

[[files]]
file = "kubejs/.vscode/probe.registry-definitions.json"

[[files]]
file = "kubejs/.vscode/settings.json"

[[files]]
file = "kubejs/README.txt"

Expand Down Expand Up @@ -102,9 +135,6 @@ file = "kubejs/assets/create/textures/block/deployer.png"
[[files]]
file = "kubejs/assets/create/textures/item/brass_hand.png"

[[files]]
file = "kubejs/assets/createmetallurgy/lang/en_us.json"

[[files]]
file = "kubejs/assets/flopper/textures/blocks/flopper_inside.png"

Expand Down Expand Up @@ -132,9 +162,6 @@ file = "kubejs/assets/grand_expanse/textures/block/copper_coil_block.png"
[[files]]
file = "kubejs/assets/grand_expanse/textures/block/copper_coil_block.png.mcmeta"

[[files]]
file = "kubejs/assets/grand_expanse/textures/block/dense_tungsten_hull.png"

[[files]]
file = "kubejs/assets/grand_expanse/textures/block/diamond_head.png"

Expand All @@ -159,9 +186,6 @@ file = "kubejs/assets/grand_expanse/textures/block/electrolyzer/tank.png"
[[files]]
file = "kubejs/assets/grand_expanse/textures/block/electrolyzer/tank_water.png"

[[files]]
file = "kubejs/assets/grand_expanse/textures/block/high_density_tungsten_block.png"

[[files]]
file = "kubejs/assets/grand_expanse/textures/block/sturdy_hull.png"

Expand Down Expand Up @@ -201,12 +225,6 @@ file = "kubejs/assets/grand_expanse/textures/item/fumo_base.png"
[[files]]
file = "kubejs/assets/grand_expanse/textures/item/gear_mold.png"

[[files]]
file = "kubejs/assets/grand_expanse/textures/item/high_density_tungsten.png"

[[files]]
file = "kubejs/assets/grand_expanse/textures/item/high_density_tungsten_sheet.png"

[[files]]
file = "kubejs/assets/grand_expanse/textures/item/incomplete_electron_tube.png"

Expand Down Expand Up @@ -234,6 +252,21 @@ file = "kubejs/assets/sophisticatedbackpacks/textures/block/diamond_clips.png"
[[files]]
file = "kubejs/assets/sophisticatedbackpacks/textures/block/gold_clips.png"

[[files]]
file = "kubejs/assets/tconstruct/lang/en_us.json"

[[files]]
file = "kubejs/assets/tconstruct/models/block/smeltery/basin.json"

[[files]]
file = "kubejs/assets/tconstruct/models/block/smeltery/table.json"

[[files]]
file = "kubejs/assets/tconstruct/textures/block/casting_basin.png"

[[files]]
file = "kubejs/assets/tconstruct/textures/block/casting_table.png"

[[files]]
file = "kubejs/assets/tinkers_construct/readme.txt"

Expand Down Expand Up @@ -378,9 +411,6 @@ file = "kubejs/server_scripts/furnace.js"
[[files]]
file = "kubejs/server_scripts/item-tags.js"

[[files]]
file = "kubejs/server_scripts/metallurgy.js"

[[files]]
file = "kubejs/server_scripts/removals.js"

Expand All @@ -390,6 +420,9 @@ file = "kubejs/server_scripts/server.js"
[[files]]
file = "kubejs/server_scripts/sifter.js"

[[files]]
file = "kubejs/server_scripts/tconstruct.js"

[[files]]
file = "kubejs/startup_scripts/blocks.js"

Expand All @@ -405,9 +438,6 @@ file = "kubejs/startup_scripts/item-events.js"
[[files]]
file = "kubejs/startup_scripts/items.js"

[[files]]
file = "kubejs/startup_scripts/tool-tiers.js"

[[files]]
file = "kubejs/startup_scripts/world-gen.js"

Expand Down Expand Up @@ -499,10 +529,6 @@ metafile = true
file = "mods/create-mechanical-extruder.pw.toml"
metafile = true

[[files]]
file = "mods/create-metallurgy.pw.toml"
metafile = true

[[files]]
file = "mods/create-power-loader.pw.toml"
metafile = true
Expand Down Expand Up @@ -699,6 +725,10 @@ metafile = true
file = "mods/lootr.pw.toml"
metafile = true

[[files]]
file = "mods/mantle.pw.toml"
metafile = true

[[files]]
file = "mods/mekanism-generators.pw.toml"
metafile = true
Expand Down Expand Up @@ -891,6 +921,10 @@ metafile = true
file = "mods/thermal-foundation.pw.toml"
metafile = true

[[files]]
file = "mods/tinkers-construct.pw.toml"
metafile = true

[[files]]
file = "mods/toms-storage.pw.toml"
metafile = true
Expand Down
Binary file modified kubejs/assets/ad_astra/textures/vehicles/tier_2_rocket.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 0 additions & 6 deletions kubejs/assets/createmetallurgy/lang/en_us.json

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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.
4 changes: 4 additions & 0 deletions kubejs/assets/tconstruct/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"block.tconstruct.seared_basin": "Casting Basin",
"block.tconstruct.seared_table": "Casting Table"
}
Loading

0 comments on commit b504926

Please sign in to comment.