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
..
java	Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering	2016-08-19 12:49:25 +02:00
resources	Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering	2016-08-19 12:49:25 +02:00