Merge pull request #1 from sabresaurus/master

merge from master
nukeandbeans · May 20, 2018 · 5cbca41 · 5cbca41
2 parents 8dcf491 + b5ab002
commit 5cbca41
Show file tree

Hide file tree

Showing 239 changed files with 16,593 additions and 12,233 deletions.
diff --git a/Changelog.txt b/Changelog.txt
diff --git a/Example Materials.meta b/Example Materials.meta
diff --git a/Example Materials/Default_Map_PaleBlue.mat.meta b/Example Materials/Default_Map_PaleBlue.mat.meta
diff --git a/Example Materials/Default_Map_Purple.mat.meta b/Example Materials/Default_Map_Purple.mat.meta
diff --git a/Example Materials/Default_Map_Red.mat b/Example Materials/Default_Map_Red.mat
diff --git a/Example Materials/Default_Map_Red.mat.meta b/Example Materials/Default_Map_Red.mat.meta
diff --git a/Example Materials/Floor_Planks.mat b/Example Materials/Floor_Planks.mat
diff --git a/Example Materials/Floor_Planks.mat.meta b/Example Materials/Floor_Planks.mat.meta
diff --git a/Example Materials/Textures.meta b/Example Materials/Textures.meta
diff --git a/Example Materials/Textures/Brick.png b/Example Materials/Textures/Brick.png