Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering

Browse Source

# Conflicts:
#	src/main/java/appeng/decorative/solid/BlockQuartzGlass.java

#	src/main/resources/assets/appliedenergistics2/blockstates/QuartzGlassBlock.json
# Changed naming convention.

...

This commit is contained in:

elix-x

2016-08-19 12:49:25 +02:00

parent 3d2ba425ec 153b38b74c

commit b31e5f5356

57 changed files with 2566 additions and 168 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

src/main/resources/assets/appliedenergistics2/textures/items/quartz_glass.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 311 B