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
  •  
  •  
  •  
373 changes: 151 additions & 222 deletions build.gradle

Large diffs are not rendered by default.

45 changes: 25 additions & 20 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,28 +1,33 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx4G
org.gradle.daemon=true
org.gradle.parallel=true
org.gradle.caching=true

mod_version=1.2.17
# Parchment mappings
neogradle.subsystems.parchment.minecraftVersion=1.21.1
neogradle.subsystems.parchment.mappingsVersion=2024.11.17

mc_version=1.20.1
mappings_version=2023.09.03
forge_version=47.4.6
# Minecraft and NeoForge
mc_version=1.21.1
mc_version_range=[1.21.1,1.22)
neo_version=21.1.219
neo_version_range=[21.1.0,)
loader_version_range=[4,)

ae2_version=12.9.8
cc_version=1.109.5
oc2_version=6280699
md_version=4873115
sedna_version=5261893
ct_version=10.1.39
jei_version=15.20.0.105
patchouli_version=84-FORGE
mekanism_version=10.4.5.19
top_version=1.20.1-10.0.1-3
ctm_version=1.1.6+8
kubejs_version=2001.6.5-build.16
rhino_version=2001.2.3-build.6
architectury_version=9.2.14
gtm_version=7.2.0
# Mod
mod_version=1.3.0
mod_id=nuclearcraft

# Dependencies
jei_version=19.21.2.313
cc_version=1.117.0
mekanism_version=10.7.18.84
top_version=1.21_neo-12.0.3-5
kubejs_version=2101.7.2-build.348
rhino_version=2101.2.7-build.81
architectury_version=13.0.8
emi_version=1.1.21+1.21.1
patchouli_version=92-NEOFORGE
gtm_version=7.0.2
ae2_version=19.2.17
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
11 changes: 7 additions & 4 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
pluginManagement {
repositories {
mavenLocal()
gradlePluginPortal()
maven { url = 'https://maven.minecraftforge.net/' }
maven { url = 'https://maven.parchmentmc.org' }
maven { url = 'https://repo.spongepowered.org/repository/maven-public/' }
maven { url = 'https://maven.neoforged.net/releases' }
}
}
}

plugins {
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
}
12 changes: 11 additions & 1 deletion src/generated/resources/assets/nuclearcraft/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@
"block.nuclearcraft.du_lithium_ion_battery": "DU Lithium Ion Battery",
"block.nuclearcraft.du_storage_container": "DU Storage Container",
"block.nuclearcraft.du_voltaic_pile": "DU Voltaic Pile",
"block.nuclearcraft.dummy_turbine_blade": "DUmmy Turbine Blade",
"block.nuclearcraft.electrolyzer": "Electrolyzer",
"block.nuclearcraft.electromagnet_yoke": "Electromagnet Yoke",
"block.nuclearcraft.electrum_block": "Electrum Block",
Expand Down Expand Up @@ -347,6 +348,7 @@
"emi.category.nuclearcraft.nc_ore_veins": "Ore Veins",
"emi.category.nuclearcraft.nuclear_furnace": "Nuclear Furnace",
"emi.category.nuclearcraft.particle_info": "Particle Info",
"emi.category.nuclearcraft.particle_source_info": "Particle Source",
"emi.category.nuclearcraft.pressurizer": "Pressurizer",
"emi.category.nuclearcraft.pump": "Pump",
"emi.category.nuclearcraft.rock_crusher": "Rock Crusher",
Expand Down Expand Up @@ -2615,6 +2617,12 @@
"side_config.right": "RIGHT: ",
"side_config.up": "UP: ",
"solar_panel.fe_generation": "Daytime Gen: %s FE/t",
"sound_event.nuclearcraft.blackhole.idle": "Black Hole Hums",
"sound_event.nuclearcraft.blackhole.spawn": "Black Hole Spawns",
"sound_event.nuclearcraft.boss_action": "Boss of the Wasteland Action",
"sound_event.nuclearcraft.boss_angry": "Boss of the Wasteland Angry",
"sound_event.nuclearcraft.boss_hit": "Boss of the Wasteland Hit",
"sound_event.nuclearcraft.boss_idle": "Boss of the Wasteland Idle",
"sound_event.nuclearcraft.feral_ghoul.death": "Feral Ghoul death",
"sound_event.nuclearcraft.feral_ghoul.idle": "Feral Ghoul idle",
"sound_event.nuclearcraft.fission_reactor": "Fission Reactor Ticking",
Expand All @@ -2629,6 +2637,7 @@
"sound_event.nuclearcraft.item.geiger_4": "Geiger Counter Ticks Level 4 Intensity",
"sound_event.nuclearcraft.item.geiger_5": "Geiger Counter Ticks Level 5 Intensity",
"sound_event.nuclearcraft.item.geiger_6": "Geiger Counter Ticks Max Intensity",
"sound_event.nuclearcraft.laser.shoot": "Laser Shoots",
"sound_event.nuclearcraft.turbine": "Turbine is spinning",
"speed.multiplier": "Speed Multiplier: x%s",
"speed.parallel_processing": "Parallel processing: x%s",
Expand Down Expand Up @@ -2782,5 +2791,6 @@
"validation.structure.wrong_corner": "Wrong corner block at: %s",
"validation.structure.wrong_inner": "Wrong Block at: %s",
"validation.structure.wrong_outer": "Wrong Casing at: %s",
"validation.structure.wrong_proportions": "Wrong proportions"
"validation.structure.wrong_proportions": "Wrong proportions",
"tooltip.nc.accelerator.too_hot": "Accelerator is too hot"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": false,
"fluid": "nuclearcraft:aluminum",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": false,
"fluid": "nuclearcraft:aluminum_clean_slurry",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": false,
"fluid": "nuclearcraft:aluminum_slurry",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": false,
"fluid": "nuclearcraft:americium_241",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": false,
"fluid": "nuclearcraft:americium_241_ni",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": false,
"fluid": "nuclearcraft:americium_241_ox",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": false,
"fluid": "nuclearcraft:americium_241_za",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": false,
"fluid": "nuclearcraft:americium_242",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": false,
"fluid": "nuclearcraft:americium_242_ni",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": false,
"fluid": "nuclearcraft:americium_242_ox",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": false,
"fluid": "nuclearcraft:americium_242_za",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": false,
"fluid": "nuclearcraft:americium_243",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": false,
"fluid": "nuclearcraft:americium_243_ni",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": false,
"fluid": "nuclearcraft:americium_243_ox",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": false,
"fluid": "nuclearcraft:americium_243_za",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": true,
"fluid": "nuclearcraft:ammonia",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": false,
"fluid": "nuclearcraft:aqua_regia_acid",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": true,
"fluid": "nuclearcraft:argon",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": false,
"fluid": "nuclearcraft:arsenic",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": false,
"fluid": "nuclearcraft:berkelium_247",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": false,
"fluid": "nuclearcraft:berkelium_247_ni",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": false,
"fluid": "nuclearcraft:berkelium_247_ox",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": false,
"fluid": "nuclearcraft:berkelium_247_za",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"parent": "forge:item/bucket",
"parent": "neoforge:item/bucket",
"apply_tint": true,
"flip_gas": false,
"fluid": "nuclearcraft:berkelium_248",
"loader": "forge:fluid_container"
"loader": "neoforge:fluid_container"
}
Loading