Skip to content
Closed
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,8 @@ dependencies {
modImplementation("dev.latvian.mods:rhino-forge:${rhino_version}")
modImplementation("dev.toma.configuration:configuration-forge-${minecraft_version}:${configuration_version}")
modImplementation("dev.architectury:architectury-forge:${architectury_version}")
jarJar(modImplementation("appeng:appliedenergistics2-forge:${ae2_version}"))
modImplementation("appeng:appliedenergistics2-forge:${ae2_version}")
jarJar("appeng:appliedenergistics2-forge:${ae2_version}")
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unnecessary, the single line does both

modImplementation("org.appliedenergistics:guideme:${guideme_version}")

modClientLocalRuntime("maven.modrinth:oculus:${oculus_version}")
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ org.gradle.jvmargs=-Xmx1G
ftblibrary_version = 2001.2.4
ftbteams_version = 2001.3.0
jade_version = 11.6.3
ae2_version=15.4.10-cosmolite.32
ae2_version=15.4.10-cosmolite.26
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

??? revert this change please i don't want cosmolite to be downgraded

Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"variants": {
"facing=down": {
"model": "monilabs:block/machine/ev_auto_charger_4x",
"x": 90
},
"facing=east": {
"model": "monilabs:block/machine/ev_auto_charger_4x",
"y": 90
},
"facing=north": {
"model": "monilabs:block/machine/ev_auto_charger_4x"
},
"facing=south": {
"model": "monilabs:block/machine/ev_auto_charger_4x",
"y": 180
},
"facing=up": {
"gtceu:z": 180,
"model": "monilabs:block/machine/ev_auto_charger_4x",
"x": 270
},
"facing=west": {
"model": "monilabs:block/machine/ev_auto_charger_4x",
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"variants": {
"facing=down": {
"model": "monilabs:block/machine/hv_auto_charger_4x",
"x": 90
},
"facing=east": {
"model": "monilabs:block/machine/hv_auto_charger_4x",
"y": 90
},
"facing=north": {
"model": "monilabs:block/machine/hv_auto_charger_4x"
},
"facing=south": {
"model": "monilabs:block/machine/hv_auto_charger_4x",
"y": 180
},
"facing=up": {
"gtceu:z": 180,
"model": "monilabs:block/machine/hv_auto_charger_4x",
"x": 270
},
"facing=west": {
"model": "monilabs:block/machine/hv_auto_charger_4x",
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"variants": {
"facing=down": {
"model": "monilabs:block/machine/iv_auto_charger_4x",
"x": 90
},
"facing=east": {
"model": "monilabs:block/machine/iv_auto_charger_4x",
"y": 90
},
"facing=north": {
"model": "monilabs:block/machine/iv_auto_charger_4x"
},
"facing=south": {
"model": "monilabs:block/machine/iv_auto_charger_4x",
"y": 180
},
"facing=up": {
"gtceu:z": 180,
"model": "monilabs:block/machine/iv_auto_charger_4x",
"x": 270
},
"facing=west": {
"model": "monilabs:block/machine/iv_auto_charger_4x",
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"variants": {
"facing=down": {
"model": "monilabs:block/machine/luv_auto_charger_4x",
"x": 90
},
"facing=east": {
"model": "monilabs:block/machine/luv_auto_charger_4x",
"y": 90
},
"facing=north": {
"model": "monilabs:block/machine/luv_auto_charger_4x"
},
"facing=south": {
"model": "monilabs:block/machine/luv_auto_charger_4x",
"y": 180
},
"facing=up": {
"gtceu:z": 180,
"model": "monilabs:block/machine/luv_auto_charger_4x",
"x": 270
},
"facing=west": {
"model": "monilabs:block/machine/luv_auto_charger_4x",
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"variants": {
"facing=down": {
"model": "monilabs:block/machine/lv_auto_charger_4x",
"x": 90
},
"facing=east": {
"model": "monilabs:block/machine/lv_auto_charger_4x",
"y": 90
},
"facing=north": {
"model": "monilabs:block/machine/lv_auto_charger_4x"
},
"facing=south": {
"model": "monilabs:block/machine/lv_auto_charger_4x",
"y": 180
},
"facing=up": {
"gtceu:z": 180,
"model": "monilabs:block/machine/lv_auto_charger_4x",
"x": 270
},
"facing=west": {
"model": "monilabs:block/machine/lv_auto_charger_4x",
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"variants": {
"facing=down": {
"model": "monilabs:block/machine/mv_auto_charger_4x",
"x": 90
},
"facing=east": {
"model": "monilabs:block/machine/mv_auto_charger_4x",
"y": 90
},
"facing=north": {
"model": "monilabs:block/machine/mv_auto_charger_4x"
},
"facing=south": {
"model": "monilabs:block/machine/mv_auto_charger_4x",
"y": 180
},
"facing=up": {
"gtceu:z": 180,
"model": "monilabs:block/machine/mv_auto_charger_4x",
"x": 270
},
"facing=west": {
"model": "monilabs:block/machine/mv_auto_charger_4x",
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"variants": {
"facing=down": {
"model": "monilabs:block/machine/uhv_auto_charger_4x",
"x": 90
},
"facing=east": {
"model": "monilabs:block/machine/uhv_auto_charger_4x",
"y": 90
},
"facing=north": {
"model": "monilabs:block/machine/uhv_auto_charger_4x"
},
"facing=south": {
"model": "monilabs:block/machine/uhv_auto_charger_4x",
"y": 180
},
"facing=up": {
"gtceu:z": 180,
"model": "monilabs:block/machine/uhv_auto_charger_4x",
"x": 270
},
"facing=west": {
"model": "monilabs:block/machine/uhv_auto_charger_4x",
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"variants": {
"facing=down": {
"model": "monilabs:block/machine/uv_auto_charger_4x",
"x": 90
},
"facing=east": {
"model": "monilabs:block/machine/uv_auto_charger_4x",
"y": 90
},
"facing=north": {
"model": "monilabs:block/machine/uv_auto_charger_4x"
},
"facing=south": {
"model": "monilabs:block/machine/uv_auto_charger_4x",
"y": 180
},
"facing=up": {
"gtceu:z": 180,
"model": "monilabs:block/machine/uv_auto_charger_4x",
"x": 270
},
"facing=west": {
"model": "monilabs:block/machine/uv_auto_charger_4x",
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"variants": {
"facing=down": {
"model": "monilabs:block/machine/zpm_auto_charger_4x",
"x": 90
},
"facing=east": {
"model": "monilabs:block/machine/zpm_auto_charger_4x",
"y": 90
},
"facing=north": {
"model": "monilabs:block/machine/zpm_auto_charger_4x"
},
"facing=south": {
"model": "monilabs:block/machine/zpm_auto_charger_4x",
"y": 180
},
"facing=up": {
"gtceu:z": 180,
"model": "monilabs:block/machine/zpm_auto_charger_4x",
"x": 270
},
"facing=west": {
"model": "monilabs:block/machine/zpm_auto_charger_4x",
"y": 270
}
}
}
6 changes: 6 additions & 0 deletions src/generated/resources/assets/monilabs/lang/en_ud.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@
"block.monilabs.dimensional_stabilization_netherite_casing": "buısɐƆ ǝʇıɹǝɥʇǝN uoıʇɐzıןıqɐʇS ןɐuoısuǝɯıᗡ",
"block.monilabs.elite_microverse_projector": "ɹoʇɔǝظoɹԀ ǝsɹǝʌoɹɔıW ǝʇıןƎ",
"block.monilabs.eltz_casing": "buısɐƆ zʇןƎ",
"block.monilabs.ev_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ǝɯǝɹʇxƎϛ§",
"block.monilabs.hv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ɥbıH9§",
"block.monilabs.hyperbolic_microverse_projector": "ɹoʇɔǝظoɹԀ ǝsɹǝʌoɹɔıW ɔıןoqɹǝdʎH",
"block.monilabs.iv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ǝuɐsuI6§",
"block.monilabs.knowledge_transmission_array": "ʎɐɹɹⱯ uoıssıɯsuɐɹ⟘ ǝbpǝןʍouʞ",
"block.monilabs.luv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ snoɹɔıpnꞀp§",
"block.monilabs.lv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ʍoꞀㄥ§",
"block.monilabs.max_1024a_laser_source_hatch": "ɥɔʇɐH ǝɔɹnoS ɹǝsɐꞀ ɹ§Ɐǝ§ㄣᄅ0'Ɩ ɹ§XⱯWן§ɔ§",
"block.monilabs.max_1024a_laser_target_hatch": "ɥɔʇɐH ʇǝbɹɐ⟘ ɹǝsɐꞀ ɹ§Ɐǝ§ㄣᄅ0'Ɩ ɹ§XⱯWן§ɔ§",
"block.monilabs.max_256a_laser_source_hatch": "ɥɔʇɐH ǝɔɹnoS ɹǝsɐꞀ ɹ§Ɐǝ§9ϛᄅ ɹ§XⱯWן§ɔ§",
Expand All @@ -22,6 +27,7 @@
"block.monilabs.microverse_casing": "buısɐƆ ǝsɹǝʌoɹɔıW",
"block.monilabs.microverse_stability_sensor_hatch": "ɥɔʇɐH ɹosuǝS ʎʇıןıqɐʇS ǝsɹǝʌoɹɔıW",
"block.monilabs.microverse_type_sensor_hatch": "ɥɔʇɐH ɹosuǝS ǝdʎ⟘ ǝsɹǝʌoɹɔıW",
"block.monilabs.mv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ɯnıpǝWq§",
"block.monilabs.prism_glass": "ssɐן⅁ ɯsıɹԀ",
"block.monilabs.prismatic_crucible": "ǝןqıɔnɹƆ ɔıʇɐɯsıɹԀ",
"block.monilabs.prismatic_focus": "snɔoℲ ɔıʇɐɯsıɹԀ",
Expand Down
6 changes: 6 additions & 0 deletions src/generated/resources/assets/monilabs/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,13 @@
"block.monilabs.dimensional_stabilization_netherite_casing": "Dimensional Stabilization Netherite Casing",
"block.monilabs.elite_microverse_projector": "Elite Microverse Projector",
"block.monilabs.eltz_casing": "Eltz Casing",
"block.monilabs.ev_auto_charger_4x": "§5Extreme Voltage§r 4x Auto Turbo Charger",
"block.monilabs.hv_auto_charger_4x": "§6High Voltage§r 4x Auto Turbo Charger",
"block.monilabs.hyperbolic_microverse_projector": "Hyperbolic Microverse Projector",
"block.monilabs.iv_auto_charger_4x": "§9Insane Voltage§r 4x Auto Turbo Charger",
"block.monilabs.knowledge_transmission_array": "Knowledge Transmission Array",
"block.monilabs.luv_auto_charger_4x": "§dLudicrous Voltage§r 4x Auto Turbo Charger",
"block.monilabs.lv_auto_charger_4x": "§7Low Voltage§r 4x Auto Turbo Charger",
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

datagen is clearly not finished, there are no lang entries for zpm through uhv

"block.monilabs.max_1024a_laser_source_hatch": "§c§lMAX§r 1,024§eA§r Laser Source Hatch",
"block.monilabs.max_1024a_laser_target_hatch": "§c§lMAX§r 1,024§eA§r Laser Target Hatch",
"block.monilabs.max_256a_laser_source_hatch": "§c§lMAX§r 256§eA§r Laser Source Hatch",
Expand All @@ -22,6 +27,7 @@
"block.monilabs.microverse_casing": "Microverse Casing",
"block.monilabs.microverse_stability_sensor_hatch": "Microverse Stability Sensor Hatch",
"block.monilabs.microverse_type_sensor_hatch": "Microverse Type Sensor Hatch",
"block.monilabs.mv_auto_charger_4x": "§bMedium Voltage§r 4x Auto Turbo Charger",
"block.monilabs.prism_glass": "Prism Glass",
"block.monilabs.prismatic_crucible": "Prismatic Crucible",
"block.monilabs.prismatic_focus": "Prismatic Focus",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"parent": "minecraft:block/block",
"loader": "gtceu:machine",
"machine": "monilabs:ev_auto_charger_4x",
"variants": {
"charger_state=finished": {
"model": {
"parent": "gtceu:block/machine/template/sided/sided",
"textures": {
"bottom": "gtceu:block/casings/voltage/ev/bottom",
"overlay_front": "gtceu:block/machines/charger/overlay_charger_finished",
"overlay_front_emissive": "gtceu:block/machines/charger/overlay_charger_finished_emissive",
"side": "gtceu:block/casings/voltage/ev/side",
"top": "gtceu:block/casings/voltage/ev/top"
}
}
},
"charger_state=idle": {
"model": {
"parent": "gtceu:block/machine/template/sided/sided",
"textures": {
"bottom": "gtceu:block/casings/voltage/ev/bottom",
"overlay_front": "gtceu:block/machines/charger/overlay_charger_idle",
"side": "gtceu:block/casings/voltage/ev/side",
"top": "gtceu:block/casings/voltage/ev/top"
}
}
},
"charger_state=running": {
"model": {
"parent": "gtceu:block/machine/template/sided/sided",
"textures": {
"bottom": "gtceu:block/casings/voltage/ev/bottom",
"overlay_front": "gtceu:block/machines/charger/overlay_charger_running",
"overlay_front_emissive": "gtceu:block/machines/charger/overlay_charger_running_emissive",
"side": "gtceu:block/casings/voltage/ev/side",
"top": "gtceu:block/casings/voltage/ev/top"
}
}
}
}
}
Loading
Loading