generated from GregTechCEu/GregTech-Addon-Template
-
Notifications
You must be signed in to change notification settings - Fork 15
Auto turbo chargers. #36
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
Closed
Closed
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
7a32fc9
Microverse Sound for projectors.
Phoenixvine32908 57c85a7
Spotless juking.
Phoenixvine32908 b9c4517
Fixing the microverse sound and hyperbolic tooltip.
Phoenixvine32908 3ca2398
Fixing the microverse sound and hyperbolic tooltip.
Phoenixvine32908 ef71783
Merge remote-tracking branch 'origin/main'
Phoenixvine32908 8bff1e9
Correct microverse sound.
Phoenixvine32908 ee4f1be
Cosmolite
Phoenixvine32908 778d0b7
Merge remote-tracking branch 'origin/main'
Phoenixvine32908 39ba8f3
Merge remote-tracking branch 'origin/main'
Phoenixvine32908 527bf7c
Merge remote-tracking branch 'origin/main'
Phoenixvine32908 eb47886
Auto turbo chargers.
Phoenixvine32908 99a1cf6
Merge branch 'main' into main
Phoenixvine32908 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ??? revert this change please i don't want cosmolite to be downgraded |
||
28 changes: 28 additions & 0 deletions
28
src/generated/resources/assets/monilabs/blockstates/ev_auto_charger_4x.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
| } | ||
| } | ||
| } |
28 changes: 28 additions & 0 deletions
28
src/generated/resources/assets/monilabs/blockstates/hv_auto_charger_4x.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
| } | ||
| } | ||
| } |
28 changes: 28 additions & 0 deletions
28
src/generated/resources/assets/monilabs/blockstates/iv_auto_charger_4x.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
| } | ||
| } | ||
| } |
28 changes: 28 additions & 0 deletions
28
src/generated/resources/assets/monilabs/blockstates/luv_auto_charger_4x.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
| } | ||
| } | ||
| } |
28 changes: 28 additions & 0 deletions
28
src/generated/resources/assets/monilabs/blockstates/lv_auto_charger_4x.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
| } | ||
| } | ||
| } |
28 changes: 28 additions & 0 deletions
28
src/generated/resources/assets/monilabs/blockstates/mv_auto_charger_4x.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
| } | ||
| } | ||
| } |
28 changes: 28 additions & 0 deletions
28
src/generated/resources/assets/monilabs/blockstates/uhv_auto_charger_4x.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
| } | ||
| } | ||
| } |
28 changes: 28 additions & 0 deletions
28
src/generated/resources/assets/monilabs/blockstates/uv_auto_charger_4x.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
| } | ||
| } | ||
| } |
28 changes: 28 additions & 0 deletions
28
src/generated/resources/assets/monilabs/blockstates/zpm_auto_charger_4x.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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", | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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", | ||
|
|
@@ -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", | ||
|
|
||
42 changes: 42 additions & 0 deletions
42
src/generated/resources/assets/monilabs/models/block/machine/ev_auto_charger_4x.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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" | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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