diff options
| author | stujones11 <stujones111@gmail.com> | 2016-04-23 18:17:38 +0100 |
|---|---|---|
| committer | stujones11 <stujones111@gmail.com> | 2016-04-23 18:17:38 +0100 |
| commit | 93b51470666389aa4dece0ce966dd6e3d04347f7 (patch) | |
| tree | 3b4f2842e1782b3e269d0e66976afbb6c6fa72d4 | |
| parent | 12b871d518046e11bd33a7f43f45ad8c37a8baba (diff) | |
| parent | 20568285809c82ae089fe2f006d5db40c6ed8c62 (diff) | |
Merge branch 'Napiophelios-master'HEADorigin/masterorigin/HEADmaster
| -rw-r--r-- | LICENSE.txt | 10 | ||||
| -rw-r--r-- | description.txt | 2 | ||||
| -rw-r--r-- | railcart/LICENSE.txt | 13 | ||||
| -rw-r--r-- | railcart/description.txt | 2 | ||||
| -rw-r--r-- | railcart/screenshot.png | bin | 0 -> 119616 bytes | |||
| -rw-r--r-- | railcart/textures/railcart.png | bin | 1475 -> 1016 bytes | |||
| -rw-r--r-- | railcart/textures/railcart_bottom.png | bin | 114 -> 349 bytes | |||
| -rw-r--r-- | railcart/textures/railcart_side.png | bin | 696 -> 432 bytes | |||
| -rw-r--r-- | railcart/textures/railcart_top.png | bin | 415 -> 428 bytes | |||
| -rw-r--r-- | railtrack/description.txt | 2 | ||||
| -rw-r--r-- | railtrack/screenshot.png | bin | 0 -> 119616 bytes | |||
| -rw-r--r-- | railtrack/textures/default_rail.png | bin | 242 -> 0 bytes | |||
| -rw-r--r-- | screenshot.png | bin | 0 -> 119616 bytes |
13 files changed, 16 insertions, 13 deletions
diff --git a/LICENSE.txt b/LICENSE.txt index abad9e1..cf57e55 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -8,12 +8,12 @@ License of media (textures, sounds and models not otherwise specified): CC-0 Authors of media files: ----------------------- -HybridDog: WTFPL +Gambit : WTFPL - Modified by Napiophelios - railcart.png - railcart_bottom.png - railcart_side.png - railcart_top.png + railcart.png + railcart_bottom.png + railcart_side.png + railcart_top.png rarkenin: diff --git a/description.txt b/description.txt new file mode 100644 index 0000000..c6048b3 --- /dev/null +++ b/description.txt @@ -0,0 +1,2 @@ +Proof of concept rail networking system +Enables rail-carts to travel through unloaded map chunks. diff --git a/railcart/LICENSE.txt b/railcart/LICENSE.txt index f0170d6..f20af39 100644 --- a/railcart/LICENSE.txt +++ b/railcart/LICENSE.txt @@ -8,14 +8,11 @@ License of media (textures, sounds and models not otherwise specified): CC-0 Authors of media files: ----------------------- -HybridDog: WTFPL +Gambit: WTFPL - Modified by Napiophelios - cart.png - cart_bottom.png - cart_side.png - cart_top.png + railcart.png + railcart_bottom.png + railcart_side.png + railcart_top.png -Zeg9: - - cart.x diff --git a/railcart/description.txt b/railcart/description.txt new file mode 100644 index 0000000..c6048b3 --- /dev/null +++ b/railcart/description.txt @@ -0,0 +1,2 @@ +Proof of concept rail networking system +Enables rail-carts to travel through unloaded map chunks. diff --git a/railcart/screenshot.png b/railcart/screenshot.png Binary files differnew file mode 100644 index 0000000..a5b26b9 --- /dev/null +++ b/railcart/screenshot.png diff --git a/railcart/textures/railcart.png b/railcart/textures/railcart.png Binary files differindex 51464af..6da6502 100644 --- a/railcart/textures/railcart.png +++ b/railcart/textures/railcart.png diff --git a/railcart/textures/railcart_bottom.png b/railcart/textures/railcart_bottom.png Binary files differindex e74ef2b..33325c2 100644 --- a/railcart/textures/railcart_bottom.png +++ b/railcart/textures/railcart_bottom.png diff --git a/railcart/textures/railcart_side.png b/railcart/textures/railcart_side.png Binary files differindex 913f5a4..797666c 100644 --- a/railcart/textures/railcart_side.png +++ b/railcart/textures/railcart_side.png diff --git a/railcart/textures/railcart_top.png b/railcart/textures/railcart_top.png Binary files differindex f574191..cf41be6 100644 --- a/railcart/textures/railcart_top.png +++ b/railcart/textures/railcart_top.png diff --git a/railtrack/description.txt b/railtrack/description.txt new file mode 100644 index 0000000..c6048b3 --- /dev/null +++ b/railtrack/description.txt @@ -0,0 +1,2 @@ +Proof of concept rail networking system +Enables rail-carts to travel through unloaded map chunks. diff --git a/railtrack/screenshot.png b/railtrack/screenshot.png Binary files differnew file mode 100644 index 0000000..a5b26b9 --- /dev/null +++ b/railtrack/screenshot.png diff --git a/railtrack/textures/default_rail.png b/railtrack/textures/default_rail.png Binary files differdeleted file mode 100644 index 26fed02..0000000 --- a/railtrack/textures/default_rail.png +++ /dev/null diff --git a/screenshot.png b/screenshot.png Binary files differnew file mode 100644 index 0000000..a5b26b9 --- /dev/null +++ b/screenshot.png |
