diff options
| author | boubou_19 <miisterunknown@gmail.com> | 2021-09-20 18:25:11 +0200 |
|---|---|---|
| committer | boubou_19 <miisterunknown@gmail.com> | 2021-09-20 18:25:11 +0200 |
| commit | 4f4ba43fa4bda651c277c4bd3852d1c8d80c46ff (patch) | |
| tree | 0fcbde81d45f3b3dc65eafd34b487c0ad25a349e /src/main/resources/assets | |
| parent | 8f5dd5625e4632bbecda0771caad47bbbbd35d4c (diff) | |
| parent | 4275142856117665d60a841710e8d9bd75d086ff (diff) | |
| download | GT5-Unofficial-4f4ba43fa4bda651c277c4bd3852d1c8d80c46ff.tar.gz GT5-Unofficial-4f4ba43fa4bda651c277c4bd3852d1c8d80c46ff.tar.bz2 GT5-Unofficial-4f4ba43fa4bda651c277c4bd3852d1c8d80c46ff.zip | |
Merge remote-tracking branch 'upstream/experimental' into experimental
Diffstat (limited to 'src/main/resources/assets')
33 files changed, 0 insertions, 0 deletions
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ADVANCEDRADIATIONPROOF.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ADVANCEDRADIATIONPROOF.png Binary files differnew file mode 100644 index 0000000000..07a96483ea --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/MACHINE_CASING_ADVANCEDRADIATIONPROOF.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.1.png Binary files differindex 30698a2098..8fcf68a843 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.1.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.1.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.2.png Binary files differindex b5c2580b3b..f733d56608 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.2.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.2.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.3.png Binary files differindex 3280ff2d94..487acf190a 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.3.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.3.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.4.png Binary files differindex 285ca65ab3..af5f6354ec 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.4.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.4.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.1.png Binary files differindex 30698a2098..8fcf68a843 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.1.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.1.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.2.png Binary files differindex b5c2580b3b..af4aa79439 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.2.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.2.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.3.png Binary files differindex 3280ff2d94..94240958ac 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.3.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.3.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.4.png Binary files differindex 285ca65ab3..d2f4a7afc5 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.4.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.4.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.1.png Binary files differindex 30698a2098..2949cb1ed1 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.1.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.1.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.2.png Binary files differindex b5c2580b3b..ebfcec0c3c 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.2.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.2.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.3.png Binary files differindex 3280ff2d94..55edeb92af 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.3.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.3.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.4.png Binary files differindex 285ca65ab3..867a79cbf6 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.4.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.4.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.1.png Binary files differindex 30698a2098..8fcf68a843 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.1.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.1.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.2.png Binary files differindex b5c2580b3b..af4aa79439 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.2.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.2.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.3.png Binary files differindex 3280ff2d94..73ffb6687e 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.3.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.3.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.4.png Binary files differindex 285ca65ab3..e5a70a9f5a 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.4.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.4.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.1.png Binary files differindex 30698a2098..165f88500c 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.1.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.1.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.2.png Binary files differindex b5c2580b3b..aaf150ea44 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.2.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.2.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.3.png Binary files differindex 3280ff2d94..2cec892752 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.3.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.3.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.4.png Binary files differindex 285ca65ab3..c3b21254a8 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.4.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.4.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.1.png Binary files differindex 30698a2098..8fcf68a843 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.1.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.1.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.2.png Binary files differindex b5c2580b3b..1a50d6cf6a 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.2.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.2.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.3.png Binary files differindex 3280ff2d94..cdb8595906 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.3.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.3.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.4.png Binary files differindex 285ca65ab3..05b4be3323 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.4.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.4.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.1.png Binary files differindex 30698a2098..8fcf68a843 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.1.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.1.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.2.png Binary files differindex b5c2580b3b..3793f02059 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.2.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.2.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.3.png Binary files differindex 3280ff2d94..1a3df516b4 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.3.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.3.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.4.png Binary files differindex 285ca65ab3..4318c12fff 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.4.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.4.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.1.png Binary files differindex 30698a2098..8fcf68a843 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.1.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.1.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.2.png Binary files differindex b5c2580b3b..af4aa79439 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.2.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.2.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.3.png Binary files differindex 3280ff2d94..fa8cb16185 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.3.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.3.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.4.png Binary files differindex 285ca65ab3..ab7236ab5e 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.4.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.4.png |
