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
..
api	Change of naming convention	2016-08-19 12:38:21 +02:00
crash	Formatted code	2015-12-24 02:03:16 +01:00
features	Merge remote-tracking branch 'origin/1.10-rv3-rendering' into 1.10-rv3-rendering	2016-08-19 12:49:25 +02:00
localization	First update pass (1/3) - ~1400 -> 82 errors	2016-06-19 14:43:27 +02:00
settings	Reduces visibility of internal fields/methods	2015-12-24 01:59:13 +01:00
stats	First update pass (1/3) - ~1400 -> 82 errors	2016-06-19 14:43:27 +02:00
sync	Third update pass (3/?)	2016-06-21 16:36:15 +02:00
worlddata	Third update pass (3/?)	2016-06-21 16:36:15 +02:00
AEConfig.java	First update pass (1/3) - ~1400 -> 82 errors	2016-06-19 14:43:27 +02:00
AELog.java	First update pass (1/3) - ~1400 -> 82 errors	2016-06-19 14:43:27 +02:00
Api.java	Formatted code	2015-12-24 02:03:16 +01:00
ApiDefinitions.java	Third update pass (3/?)	2016-06-21 16:36:15 +02:00
AppEng.java	Enabled block states ignoring properties	2016-07-01 20:19:10 +02:00
CommonHelper.java	Removed old rendering system	2016-06-29 12:22:18 +02:00
CreativeTab.java	First update pass (1/3) - ~1400 -> 82 errors	2016-06-19 14:43:27 +02:00
CreativeTabFacade.java	First update pass (1/3) - ~1400 -> 82 errors	2016-06-19 14:43:27 +02:00
FacadeConfig.java	Second update pass (2/3) - 82 -> 0 errors	2016-06-21 11:03:10 +02:00
FeatureHandlerRegistry.java	Reduces visibility of internal fields/methods	2015-12-24 01:59:13 +01:00
FeatureRegistry.java	Third update pass (3/?)	2016-06-21 16:36:15 +02:00
IMCHandler.java	Refactored the logging	2016-01-01 02:55:36 +01:00
RecipeLoader.java	Refactored the logging	2016-01-01 02:55:36 +01:00
Registration.java	Change of naming convention	2016-08-19 12:38:21 +02:00