Skip to content

Commit

Permalink
0.7 Update for 1.12.2 (#13)
Browse files Browse the repository at this point in the history
* 28.01.2024

- [💎 Gems](2fd2eef)
- [🪑 Wood Plate Rework](ab95817)

* Some springs correction

- [♨ Springs](8d51a17)

* Gem fixes and Rubber remake

* dull update

- [💩 Dull Dust update](87ebfea)

* metallic

- [🤘 Metallic Material Sets](f9b9b94)

* bright and shiny

- [✨ Bright and Shiny Material Sets](127605e)

* Finalize material sets

* blah blah wire fix

* Prospectors

* Fixes

* New shiny

* Update pack.mcmeta

* UIV and UEV casings

* UEV and UHV components

* UEV, UXV, UIV, OPV meta items

* Shapes, Molds and Lenses

* 0.7 update

* Update pack.mcmeta
  • Loading branch information
marisathewitch authored Feb 22, 2024
1 parent 25918a2 commit 7510ce0
Show file tree
Hide file tree
Showing 182 changed files with 356 additions and 8 deletions.
Binary file modified assets/gregtech/textures/blocks/casings/voltage/uev/bottom.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 assets/gregtech/textures/blocks/casings/voltage/uev/side.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 assets/gregtech/textures/blocks/casings/voltage/uev/top.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 assets/gregtech/textures/blocks/casings/voltage/uiv/bottom.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 assets/gregtech/textures/blocks/casings/voltage/uiv/side.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 assets/gregtech/textures/blocks/casings/voltage/uiv/top.png
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.
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"ctm": {
"ctm_version": 1,
"layer": "BLOOM",
"gregtech": true,
"extra": {
"light": 15
}
}
}
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"ctm": {
"ctm_version": 1,
"layer": "BLOOM",
"gtceu": true,
"extra": {
"light": 15
}
}
}
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.
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.
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.
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.
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.
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.
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
{
"animation": {
"interpolate": true,
"frametime": 1,
"frametime": 20,
"frames": [
0,
0,
1,
2,
3,
4,
5,
6,
7
1
]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"animation": {
"interpolate": true,
"frametime": 20,
"frames": [
0,
0,
1,
1
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"animation": {
"interpolate": true,
"frametime": 20,
"frames": [
0,
0,
1,
1
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"animation": {
"interpolate": true,
"frametime": 20,
"frames": [
0,
0,
1,
1
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}
12 changes: 12 additions & 0 deletions assets/gregtech/textures/items/metaitems/emitter.opv.png.mcmeta
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"animation": {
"interpolate": true,
"frametime": 20,
"frames": [
0,
0,
1,
1
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"animation": {
"frametime": 1,
"frames": [
{ "index": 0, "time": 10},
{ "index": 1, "time": 2},
{ "index": 2, "time": 10},
{ "index": 3, "time": 2},
{ "index": 4, "time": 10},
{ "index": 5, "time": 2},
{ "index": 6, "time": 10},
{ "index": 7, "time": 2}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"animation": {
"frametime": 1,
"frames": [
{ "index": 0, "time": 12},
{ "index": 1, "time": 2},
{ "index": 2, "time": 12},
{ "index": 3, "time": 2},
{ "index": 4, "time": 12},
{ "index": 5, "time": 2},
{ "index": 6, "time": 12},
{ "index": 7, "time": 2}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"animation": {
"frametime": 1,
"frames": [
{ "index": 0, "time": 8},
{ "index": 1, "time": 2},
{ "index": 2, "time": 8},
{ "index": 3, "time": 2},
{ "index": 4, "time": 8},
{ "index": 5, "time": 2},
{ "index": 6, "time": 8},
{ "index": 7, "time": 2}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"animation": {
"frametime": 1,
"frames": [
{ "index": 0, "time": 6},
{ "index": 1, "time": 2},
{ "index": 2, "time": 6},
{ "index": 3, "time": 2},
{ "index": 4, "time": 6},
{ "index": 5, "time": 2},
{ "index": 6, "time": 6},
{ "index": 7, "time": 2}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"animation": {
"frametime": 1,
"frames": [
{ "index": 0, "time": 16},
{ "index": 1, "time": 2},
{ "index": 2, "time": 16},
{ "index": 3, "time": 2},
{ "index": 4, "time": 16},
{ "index": 5, "time": 2},
{ "index": 6, "time": 16},
{ "index": 7, "time": 2}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"animation": {
"frametime": 1,
"frames": [
{ "index": 0, "time": 14},
{ "index": 1, "time": 2},
{ "index": 2, "time": 14},
{ "index": 3, "time": 2},
{ "index": 4, "time": 14},
{ "index": 5, "time": 2},
{ "index": 6, "time": 14},
{ "index": 7, "time": 2}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation": {
"interpolate": true,
"frametime": 2
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation": {
"interpolate": true,
"frametime": 8
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"animation": {
"frametime": 1,
"frames": [
{ "index": 0, "time": 2},
{ "index": 1, "time": 1},
{ "index": 2, "time": 2},
{ "index": 3, "time": 1},
{ "index": 4, "time": 2},
{ "index": 5, "time": 1},
{ "index": 6, "time": 2},
{ "index": 7, "time": 1}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation": {
"interpolate": true,
"frametime": 6
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"animation": {
"frametime": 1,
"frames": [
{ "index": 0, "time": 2},
{ "index": 1, "time": 2},
{ "index": 2, "time": 2},
{ "index": 3, "time": 2},
{ "index": 4, "time": 2},
{ "index": 5, "time": 2},
{ "index": 6, "time": 2},
{ "index": 7, "time": 2}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation": {
"interpolate": true,
"frametime": 4
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"animation": {
"frametime": 1,
"frames": [
{ "index": 0, "time": 4},
{ "index": 1, "time": 2},
{ "index": 2, "time": 4},
{ "index": 3, "time": 2},
{ "index": 4, "time": 4},
{ "index": 5, "time": 2},
{ "index": 6, "time": 4},
{ "index": 7, "time": 2}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"animation": {
"interpolate": true,
"frametime": 20,
"frames": [
0,
0,
1,
1
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}
Binary file added assets/gregtech/textures/items/metaitems/lens.png
Diff not rendered.
12 changes: 12 additions & 0 deletions assets/gregtech/textures/items/metaitems/robot.arm.opv.png.mcmeta
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"animation": {
"interpolate": true,
"frametime": 20,
"frames": [
0,
0,
1,
1
]
}
}
Binary file modified assets/gregtech/textures/items/metaitems/sensor.luv.png
12 changes: 12 additions & 0 deletions assets/gregtech/textures/items/metaitems/sensor.opv.png.mcmeta
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"animation": {
"interpolate": true,
"frametime": 20,
"frames": [
0,
0,
1,
1
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 2
}
}
13 changes: 13 additions & 0 deletions assets/gregtech/textures/items/metaitems/tool.dataorb.png.mcmeta
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"animation": {
"frametime": 1,
"frames": [
{ "index": 0, "time": 50 },
{ "index": 1, "time": 2 },
{ "index": 2, "time": 2 },
{ "index": 3, "time": 2 },
{ "index": 4, "time": 2 },
{ "index": 5, "time": 2 }
]
}
}
Loading

0 comments on commit 7510ce0

Please sign in to comment.