elix-x b31e5f5356 Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering ... # Conflicts: # src/main/java/appeng/decorative/solid/BlockQuartzGlass.java # src/main/resources/assets/appliedenergistics2/blockstates/QuartzGlassBlock.json # Changed naming convention.		2016-08-19 12:49:25 +02:00
..
quartz_glass_a.png	Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering	2016-08-19 12:49:25 +02:00
quartz_glass_b.png	Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering	2016-08-19 12:49:25 +02:00
quartz_glass_c.png	Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering	2016-08-19 12:49:25 +02:00
quartz_glass_d.png	Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering	2016-08-19 12:49:25 +02:00
quartz_glass_frame0001.png	Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering	2016-08-19 12:49:25 +02:00
quartz_glass_frame0010.png	Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering	2016-08-19 12:49:25 +02:00
quartz_glass_frame0011.png	Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering	2016-08-19 12:49:25 +02:00
quartz_glass_frame0100.png	Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering	2016-08-19 12:49:25 +02:00
quartz_glass_frame0101.png	Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering	2016-08-19 12:49:25 +02:00
quartz_glass_frame0110.png	Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering	2016-08-19 12:49:25 +02:00
quartz_glass_frame0111.png	Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering	2016-08-19 12:49:25 +02:00
quartz_glass_frame1000.png	Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering	2016-08-19 12:49:25 +02:00
quartz_glass_frame1001.png	Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering	2016-08-19 12:49:25 +02:00
quartz_glass_frame1010.png	Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering	2016-08-19 12:49:25 +02:00
quartz_glass_frame1011.png	Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering	2016-08-19 12:49:25 +02:00
quartz_glass_frame1100.png	Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering	2016-08-19 12:49:25 +02:00
quartz_glass_frame1101.png	Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering	2016-08-19 12:49:25 +02:00
quartz_glass_frame1110.png	Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering	2016-08-19 12:49:25 +02:00
quartz_glass_frame1111.png	Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering	2016-08-19 12:49:25 +02:00