-
Notifications
You must be signed in to change notification settings - Fork 67
Added several compatibilities for thermal, fixed the silver ingot texture for ic2 and added colored hearts compatibility #265
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
Open
Dubl33
wants to merge
13
commits into
Unity-Resource-Pack:1.12_plus
Choose a base branch
from
Dubl33:1.12_plus
base: 1.12_plus
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
61d99c5
Add files via upload
Dubl33 c7881cb
Add files via upload
Dubl33 001e6a8
Improved machine frame textures
Dubl33 141bf64
Updated existing aqueous accumulator textures.
Dubl33 7faa04f
Added textures for the numismatic dynamo
Dubl33 8eb4876
Added textures for the compactor, refinery...
Dubl33 ddb2b78
Added support for signalum cell
Dubl33 095f66c
Fixed silver texture
Dubl33 b81c465
changed the cell configs to match the updated cell textures
Dubl33 9db59e7
Added capacitor state lights compat
Dubl33 7afbc5a
added active compactor mcmeta
Dubl33 e27d000
test compactor
Dubl33 af0c129
Added arcane ensorcellator textures
Dubl33 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
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.
Binary file modified
BIN
-140 Bytes
(89%)
assets/thermalexpansion/textures/blocks/config/cell_config_blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-140 Bytes
(89%)
assets/thermalexpansion/textures/blocks/config/cell_config_blue_cb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-147 Bytes
(88%)
assets/thermalexpansion/textures/blocks/config/cell_config_orange.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-147 Bytes
(88%)
assets/thermalexpansion/textures/blocks/config/cell_config_orange_cb.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+368 Bytes
assets/thermalexpansion/textures/blocks/device/device_active_diffuser.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: 6 additions & 0 deletions
6
assets/thermalexpansion/textures/blocks/device/device_active_diffuser.png.mcmeta
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,6 @@ | ||
{ | ||
"animation": { | ||
"interpolate": true, | ||
"frametime": 8 | ||
} | ||
} |
Binary file added
BIN
+297 Bytes
assets/thermalexpansion/textures/blocks/device/device_active_factorizer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions
14
assets/thermalexpansion/textures/blocks/device/device_active_factorizer.png.mcmeta
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,14 @@ | ||
{ | ||
"animation": { | ||
"interpolate": true, | ||
"frametime": 8, | ||
"frames": [ | ||
0, | ||
1, | ||
2, | ||
3, | ||
2, | ||
1 | ||
] | ||
} | ||
} |
Binary file added
BIN
+317 Bytes
assets/thermalexpansion/textures/blocks/device/device_active_fisher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions
5
assets/thermalexpansion/textures/blocks/device/device_active_fisher.png.mcmeta
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,5 @@ | ||
{ | ||
"animation": { | ||
"frametime": 128 | ||
} | ||
} |
Binary file added
BIN
+470 Bytes
assets/thermalexpansion/textures/blocks/device/device_active_fluid_buffer.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: 6 additions & 0 deletions
6
assets/thermalexpansion/textures/blocks/device/device_active_fluid_buffer.png.mcmeta
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,6 @@ | ||
{ | ||
"animation": { | ||
"interpolate": true, | ||
"frametime": 4 | ||
} | ||
} |
Binary file added
BIN
+408 Bytes
assets/thermalexpansion/textures/blocks/device/device_active_heat_sink.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions
5
assets/thermalexpansion/textures/blocks/device/device_active_heat_sink.png.mcmeta
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,5 @@ | ||
{ | ||
"animation": { | ||
"frametime": 4 | ||
} | ||
} |
Binary file added
BIN
+479 Bytes
assets/thermalexpansion/textures/blocks/device/device_active_item_buffer.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: 6 additions & 0 deletions
6
assets/thermalexpansion/textures/blocks/device/device_active_item_buffer.png.mcmeta
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,6 @@ | ||
{ | ||
"animation": { | ||
"interpolate": true, | ||
"frametime": 4 | ||
} | ||
} |
Binary file added
BIN
+293 Bytes
assets/thermalexpansion/textures/blocks/device/device_active_item_collector.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+383 Bytes
assets/thermalexpansion/textures/blocks/device/device_active_lexicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions
14
assets/thermalexpansion/textures/blocks/device/device_active_lexicon.png.mcmeta
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,14 @@ | ||
{ | ||
"animation": { | ||
"interpolate": true, | ||
"frametime": 8, | ||
"frames": [ | ||
0, | ||
1, | ||
2, | ||
3, | ||
2, | ||
1 | ||
] | ||
} | ||
} |
Binary file added
BIN
+403 Bytes
assets/thermalexpansion/textures/blocks/device/device_active_mob_catcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions
13
assets/thermalexpansion/textures/blocks/device/device_active_mob_catcher.png.mcmeta
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,13 @@ | ||
{ | ||
"animation": { | ||
"frametime": 16, | ||
"frames": [ | ||
0, | ||
1, | ||
2, | ||
3, | ||
2, | ||
1 | ||
] | ||
} | ||
} |
Binary file modified
BIN
-1.19 KB
(18%)
assets/thermalexpansion/textures/blocks/device/device_active_nullifier.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+291 Bytes
assets/thermalexpansion/textures/blocks/device/device_active_tapper.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+318 Bytes
assets/thermalexpansion/textures/blocks/device/device_active_water_gen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+298 Bytes
assets/thermalexpansion/textures/blocks/device/device_active_xp_collector.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions
14
assets/thermalexpansion/textures/blocks/device/device_active_xp_collector.png.mcmeta
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,14 @@ | ||
{ | ||
"animation": { | ||
"interpolate": true, | ||
"frametime": 8, | ||
"frames": [ | ||
0, | ||
1, | ||
2, | ||
3, | ||
2, | ||
1 | ||
] | ||
} | ||
} |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+301 Bytes
assets/thermalexpansion/textures/blocks/device/device_face_diffuser.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+249 Bytes
assets/thermalexpansion/textures/blocks/device/device_face_factorizer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+288 Bytes
assets/thermalexpansion/textures/blocks/device/device_face_fisher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+293 Bytes
assets/thermalexpansion/textures/blocks/device/device_face_fluid_buffer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+298 Bytes
assets/thermalexpansion/textures/blocks/device/device_face_heat_sink.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+304 Bytes
assets/thermalexpansion/textures/blocks/device/device_face_item_buffer.png
Oops, something went wrong.
Binary file added
BIN
+282 Bytes
assets/thermalexpansion/textures/blocks/device/device_face_item_collector.png
Oops, something went wrong.
Binary file added
BIN
+322 Bytes
assets/thermalexpansion/textures/blocks/device/device_face_lexicon.png
Oops, something went wrong.
Binary file added
BIN
+279 Bytes
assets/thermalexpansion/textures/blocks/device/device_face_mob_catcher.png
Oops, something went wrong.
Binary file modified
BIN
-1.15 KB
(18%)
assets/thermalexpansion/textures/blocks/device/device_face_nullifier.png
Oops, something went wrong.
Binary file added
BIN
+281 Bytes
assets/thermalexpansion/textures/blocks/device/device_face_tapper.png
Oops, something went wrong.
Binary file added
BIN
+306 Bytes
assets/thermalexpansion/textures/blocks/device/device_face_water_gen.png
Oops, something went wrong.
Binary file added
BIN
+286 Bytes
assets/thermalexpansion/textures/blocks/device/device_face_xp_collector.png
Oops, something went wrong.
Binary file added
BIN
+279 Bytes
assets/thermalexpansion/textures/blocks/device/device_frame_bottom.png
Oops, something went wrong.
Binary file added
BIN
+265 Bytes
assets/thermalexpansion/textures/blocks/device/device_frame_inner.png
Oops, something went wrong.
Binary file added
BIN
+284 Bytes
assets/thermalexpansion/textures/blocks/device/device_frame_side.png
Oops, something went wrong.
Binary file added
BIN
+279 Bytes
assets/thermalexpansion/textures/blocks/device/device_frame_top.png
Oops, something went wrong.
Binary file modified
BIN
-1.06 KB
(21%)
assets/thermalexpansion/textures/blocks/device/device_side.png
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Binary file added
BIN
+693 Bytes
assets/thermalexpansion/textures/blocks/machine/machine_active_brewer.png
Oops, something went wrong.
5 changes: 5 additions & 0 deletions
5
assets/thermalexpansion/textures/blocks/machine/machine_active_brewer.png.mcmeta
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,5 @@ | ||
{ | ||
"animation": { | ||
"frametime": 8 | ||
} | ||
} |
Binary file added
BIN
+652 Bytes
assets/thermalexpansion/textures/blocks/machine/machine_active_centrifuge.png
Oops, something went wrong.
7 changes: 7 additions & 0 deletions
7
assets/thermalexpansion/textures/blocks/machine/machine_active_centrifuge.png.mcmeta
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,7 @@ | ||
{ | ||
"animation": { | ||
"frametime": 6, | ||
"interpolate": true | ||
|
||
} | ||
} |
Binary file added
BIN
+648 Bytes
assets/thermalexpansion/textures/blocks/machine/machine_active_compactor.png
Oops, something went wrong.
5 changes: 5 additions & 0 deletions
5
assets/thermalexpansion/textures/blocks/machine/machine_active_compactor.png.mcmeta
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,5 @@ | ||
{ | ||
"animation": { | ||
"frametime": 4 | ||
} | ||
} |
Binary file modified
BIN
+1.79 KB
(220%)
assets/thermalexpansion/textures/blocks/machine/machine_active_crafter.png
Oops, something went wrong.
14 changes: 5 additions & 9 deletions
14
assets/thermalexpansion/textures/blocks/machine/machine_active_crafter.png.mcmeta
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 |
---|---|---|
@@ -1,10 +1,6 @@ | ||
{ | ||
"animation": { | ||
"frametime": 1, | ||
"frames": [ | ||
0, | ||
1, | ||
2 | ||
] | ||
} | ||
} | ||
"animation": { | ||
"interpolate": true, | ||
"frametime": 4 | ||
} | ||
} |
Binary file added
BIN
+2.58 KB
assets/thermalexpansion/textures/blocks/machine/machine_active_enchanter.png
Oops, something went wrong.
5 changes: 5 additions & 0 deletions
5
assets/thermalexpansion/textures/blocks/machine/machine_active_enchanter.png.mcmeta
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,5 @@ | ||
{ | ||
"animation": { | ||
"frametime": 8 | ||
} | ||
} |
Binary file modified
BIN
-2.28 KB
(40%)
assets/thermalexpansion/textures/blocks/machine/machine_active_insolator.png
Oops, something went wrong.
Binary file added
BIN
+1.08 KB
assets/thermalexpansion/textures/blocks/machine/machine_active_refinery.png
Oops, something went wrong.
6 changes: 6 additions & 0 deletions
6
assets/thermalexpansion/textures/blocks/machine/machine_active_refinery.png.mcmeta
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,6 @@ | ||
{ | ||
"animation": { | ||
"frametime": 8, | ||
"interpolate": true | ||
} | ||
} |
Binary file added
BIN
+494 Bytes
assets/thermalexpansion/textures/blocks/machine/machine_face_brewer.png
Oops, something went wrong.
Binary file added
BIN
+523 Bytes
assets/thermalexpansion/textures/blocks/machine/machine_face_centrifuge.png
Oops, something went wrong.
Binary file added
BIN
+429 Bytes
assets/thermalexpansion/textures/blocks/machine/machine_face_compactor.png
Oops, something went wrong.
Binary file added
BIN
+529 Bytes
assets/thermalexpansion/textures/blocks/machine/machine_face_crafter.png
Oops, something went wrong.
Binary file added
BIN
+493 Bytes
assets/thermalexpansion/textures/blocks/machine/machine_face_enchanter.png
Oops, something went wrong.
Binary file modified
BIN
-2.62 KB
(18%)
assets/thermalexpansion/textures/blocks/machine/machine_face_insolator.png
Oops, something went wrong.
Binary file added
BIN
+534 Bytes
assets/thermalexpansion/textures/blocks/machine/machine_face_refinery.png
Oops, something went wrong.
Oops, something went wrong.
Binary file modified
BIN
-932 Bytes
(39%)
assets/thermalexpansion/textures/blocks/storage/cell_side_0.png
Oops, something went wrong.
Binary file modified
BIN
-939 Bytes
(36%)
assets/thermalexpansion/textures/blocks/storage/cell_side_1.png
Oops, something went wrong.
Binary file modified
BIN
-1014 Bytes
(35%)
assets/thermalexpansion/textures/blocks/storage/cell_side_2.png
Oops, something went wrong.
Oops, something went wrong.
Binary file modified
BIN
-917 Bytes
(41%)
assets/thermalexpansion/textures/blocks/storage/cell_side_4.png
Oops, something went wrong.
Binary file modified
BIN
-1.01 KB
(21%)
assets/thermalexpansion/textures/blocks/storage/cell_side_c.png
Oops, something went wrong.
Oops, something went wrong.
Binary file added
BIN
+239 Bytes
assets/thermalexpansion/textures/items/capacitor/capacitor_mode_0_0.png
Oops, something went wrong.
Binary file added
BIN
+246 Bytes
assets/thermalexpansion/textures/items/capacitor/capacitor_mode_0_1.png
Oops, something went wrong.
Binary file added
BIN
+262 Bytes
assets/thermalexpansion/textures/items/capacitor/capacitor_mode_0_2.png
Oops, something went wrong.
Binary file added
BIN
+239 Bytes
assets/thermalexpansion/textures/items/capacitor/capacitor_mode_1_0.png
Oops, something went wrong.
Binary file added
BIN
+246 Bytes
assets/thermalexpansion/textures/items/capacitor/capacitor_mode_1_1.png
Oops, something went wrong.
Binary file added
BIN
+262 Bytes
assets/thermalexpansion/textures/items/capacitor/capacitor_mode_1_2.png
Oops, something went wrong.
Binary file added
BIN
+307 Bytes
assets/thermalexpansion/textures/items/frame/frame_machine_inner.png
Oops, something went wrong.
Binary file modified
BIN
-1.15 KB
(28%)
assets/thermalexpansion/textures/items/frame/frame_machine_side.png
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.
Made it so it looks like there's bubbles floating upwards while it's working, kinda like in the gui of the brewing stand