diff options
author | Vanessa Ezekowitz <vanessaezekowitz@gmail.com> | 2014-07-30 15:36:27 -0400 |
---|---|---|
committer | Vanessa Ezekowitz <vanessaezekowitz@gmail.com> | 2014-07-30 15:36:27 -0400 |
commit | 88bdac62e3f36c1125c82b44e2bc6fd718e05322 (patch) | |
tree | ebccbef615c51104a6cbca2d3ab957a29445a4ae /technic_worldgen/textures | |
parent | 12d0c6522bbca906910aae0321cbaa7eb48db8c2 (diff) | |
parent | 60bc80692ba51ad0a7f2391803ee454b18cb7174 (diff) |
Merge remote-tracking branch 'zefram/zefram/centrifuge'
Diffstat (limited to 'technic_worldgen/textures')
-rw-r--r-- | technic_worldgen/textures/technic_uranium_ingot.png | bin | 0 -> 300 bytes |
-rw-r--r-- | technic_worldgen/textures/technic_uranium_lump.png (renamed from technic_worldgen/textures/technic_uranium.png) | bin | 352 -> 352 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/technic_worldgen/textures/technic_uranium_ingot.png b/technic_worldgen/textures/technic_uranium_ingot.png Binary files differnew file mode 100644 index 0000000..38978f8 --- /dev/null +++ b/technic_worldgen/textures/technic_uranium_ingot.png diff --git a/technic_worldgen/textures/technic_uranium.png b/technic_worldgen/textures/technic_uranium_lump.png Binary files differindex 2f5a66c..2f5a66c 100644 --- a/technic_worldgen/textures/technic_uranium.png +++ b/technic_worldgen/textures/technic_uranium_lump.png |