Fixed issues from merging

src/app_context.ts

@@ -20,7 +20,6 @@ import { ColourSpace, EAction } from './util';
 import { ASSERT } from './util/error_util';
 import { LOG_ERROR, Logger } from './util/log_util';
 import { AppPaths, PathUtil } from './util/path_util';
-
 import { TWorkerJob, WorkerController } from './worker_controller';
 import { SetMaterialsParams, TFromWorkerMessage, TToWorkerMessage } from './worker_types';
 
@@ -194,7 +193,7 @@ export class AppContext {
             this._materialMap = payload.result.materials;
             this._onMaterialMapChanged();
 
-            if (payload.result.triangleCount < AppConfig.RENDER_TRIANGLE_THRESHOLD) {
+            if (payload.result.triangleCount < AppConfig.Get.RENDER_TRIANGLE_THRESHOLD) {
                 outputElement.setTaskInProgress('render', '[Renderer]: Processing...');
                 this._workerController.addJob(this._renderMesh());
             } else {

src/buffer.ts

@@ -6,6 +6,7 @@ import { Mesh, SolidMaterial, TexturedMaterial } from './mesh';
 import { OcclusionManager } from './occlusion';
 import { ProgressManager } from './progress';
 import { AttributeData } from './render_buffer';
+import { ASSERT } from './util/error_util';
 import { Vector3 } from './vector';
 import { VoxelMesh } from './voxel_mesh';
 import { RenderNextVoxelMeshChunkParams } from './worker_types';
@@ -70,7 +71,7 @@ export class ChunkedBufferGenerator {
 
         for (let i = 0; i < numBufferVoxels; ++i) {
             const voxelIndex = i + voxelsStartIndex;
-            
+
             const voxel = voxels[voxelIndex];
             const voxelColourArray = [voxel.colour.r, voxel.colour.g, voxel.colour.b, voxel.colour.a];
             const voxelPositionArray = voxel.position.toArray();

src/colour.ts

@@ -42,6 +42,7 @@ export namespace RGBAUtil {
 
     export function toUint8String(a: RGBA) {
         return `(${Math.floor(255 * a.r)}, ${Math.floor(255 * a.g)}, ${Math.floor(255 * a.b)}, ${Math.floor(255 * a.a)})`;
+    }
 
     export function toRGBA255(c: RGBA): RGBA_255 {
         const out: RGBA = {

styles.css

@@ -644,6 +644,7 @@ a:hover {
   appearance: none;
   background: none;
   width: 75%;
+  height: 24px;
   margin: 0px;
   padding: 0px;
 }