Skip to content

Commit

Permalink
Merge pull request #9 from marisathewitch/mc-1.12
Browse files Browse the repository at this point in the history
Mc 1.12 another update
  • Loading branch information
ULSTICK authored Jan 20, 2024
2 parents 6e24870 + 7536d7d commit 8adb67e
Show file tree
Hide file tree
Showing 518 changed files with 447 additions and 1 deletion.
8 changes: 8 additions & 0 deletions assets/gregtech/models/item/tools/spade.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"parent": "item/handheld",
"textures": {
"layer0": "gregtech:items/tools/spade_handle",
"layer1": "gregtech:items/tools/spade",
"layer2": "gregtech:items/tools/spade_overlay"
}
}
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.
Binary file modified assets/gregtech/textures/blocks/casings/voltage/max/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/max/side.png
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,58 @@
{
"animation": {
"interpolate": false,
"frametime": 2,
"frames": [
{ "index": 0, "time": 60 },
1,
2,
3,
2,
1,
{ "index": 0, "time": 60 },
1,
2,
3,
2,
1,
{ "index": 0, "time": 60 },
1,
2,
3,
4,
5,
6,
{ "index": 7, "time": 120 },
6,
5,
4,
3,
2,
1,
{ "index": 0, "time": 60 },
1,
2,
3,
2,
1,
{ "index": 0, "time": 60 },
1,
2,
3,
2,
1,
{ "index": 0, "time": 60 },
1,
2,
3,
4,
8,
{ "index": 9, "time": 120 },
8,
4,
3,
2,
1
]
}
}
Binary file modified assets/gregtech/textures/blocks/casings/voltage/max/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/uhv/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/uhv/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/uhv/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/zpm/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/zpm/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/zpm/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.
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":3
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation":{
"frametime":3
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation":{
"frametime": 4,
"interpolate": true
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation":{
"frametime": 2,
"interpolate": true
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation":{
"frametime": 2,
"interpolate": true
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation":{
"frametime": 2,
"interpolate": true
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation":{
"frametime": 2,
"interpolate": true
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation":{
"frametime": 2,
"interpolate": true
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation":{
"frametime": 2,
"interpolate": true
}
}
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,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,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,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,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,5 @@
{
"animation":{
"frametime":1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation":{
"frametime":1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation":{
"frametime":1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation":{
"frametime":1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"animation": {
"frametime": 1,
"frames": [
{ "index": 8, "time": 4 },
{ "index": 9, "time": 4 },
{ "index": 10, "time": 4 },
{ "index": 11, "time": 4 },
{ "index": 12, "time": 4 },
{ "index": 13, "time": 4 },
{ "index": 14, "time": 4 },
{ "index": 15, "time": 4 },
{ "index": 7, "time": 2 },
{ "index": 6, "time": 2 },
{ "index": 5, "time": 2 },
{ "index": 4, "time": 2 },
{ "index": 3, "time": 2 },
{ "index": 2, "time": 2 },
{ "index": 1, "time": 2 },
{ "index": 0, "time": 2 },
{ "index": 1, "time": 2 },
{ "index": 2, "time": 2 },
{ "index": 3, "time": 2 },
{ "index": 4, "time": 2 },
{ "index": 3, "time": 2 },
{ "index": 2, "time": 2 },
{ "index": 10, "time": 4 },
{ "index": 11, "time": 4 },
{ "index": 12, "time": 4 },
{ "index": 13, "time": 4 },
{ "index": 5, "time": 2 },
{ "index": 6, "time": 2 },
{ "index": 7, "time": 2 },
{ "index": 15, "time": 4 },
{ "index": 14, "time": 4 },
{ "index": 13, "time": 4 },
{ "index": 12, "time": 4 },
{ "index": 11, "time": 4 },
{ "index": 10, "time": 4 },
{ "index": 2, "time": 2 },
{ "index": 1, "time": 2 },
{ "index": 0, "time": 2 },
{ "index": 8, "time": 4 },
{ "index": 9, "time": 4 },
{ "index": 10, "time": 4 },
{ "index": 2, "time": 2 },
{ "index": 10, "time": 4 },
{ "index": 9, "time": 4 },
{ "index": 8, "time": 4 },
{ "index": 0, "time": 2 }
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"animation": {
"frametime": 1,
"frames": [
{ "index": 8, "time": 4 },
{ "index": 9, "time": 4 },
{ "index": 10, "time": 4 },
{ "index": 11, "time": 4 },
{ "index": 12, "time": 4 },
{ "index": 13, "time": 4 },
{ "index": 14, "time": 4 },
{ "index": 15, "time": 4 },
{ "index": 7, "time": 2 },
{ "index": 6, "time": 2 },
{ "index": 5, "time": 2 },
{ "index": 4, "time": 2 },
{ "index": 3, "time": 2 },
{ "index": 2, "time": 2 },
{ "index": 1, "time": 2 },
{ "index": 0, "time": 2 },
{ "index": 1, "time": 2 },
{ "index": 2, "time": 2 },
{ "index": 3, "time": 2 },
{ "index": 4, "time": 2 },
{ "index": 3, "time": 2 },
{ "index": 2, "time": 2 },
{ "index": 10, "time": 4 },
{ "index": 11, "time": 4 },
{ "index": 12, "time": 4 },
{ "index": 13, "time": 4 },
{ "index": 5, "time": 2 },
{ "index": 6, "time": 2 },
{ "index": 7, "time": 2 },
{ "index": 15, "time": 4 },
{ "index": 14, "time": 4 },
{ "index": 13, "time": 4 },
{ "index": 12, "time": 4 },
{ "index": 11, "time": 4 },
{ "index": 10, "time": 4 },
{ "index": 2, "time": 2 },
{ "index": 1, "time": 2 },
{ "index": 0, "time": 2 },
{ "index": 8, "time": 4 },
{ "index": 9, "time": 4 },
{ "index": 10, "time": 4 },
{ "index": 2, "time": 2 },
{ "index": 10, "time": 4 },
{ "index": 9, "time": 4 },
{ "index": 8, "time": 4 },
{ "index": 0, "time": 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,5 @@
{
"animation": {
"frametime": 2
}
}
Loading

0 comments on commit 8adb67e

Please sign in to comment.