Merge branch 'main' into new

desktopRuntime/eclipseProject/.classpath

@@ -7,17 +7,17 @@
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/CompileEPK.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/CompileEPK.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/Java-WebSocket-1.5.1-with-dependencies.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/Java-WebSocket-1.5.1-with-dependencies.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/MakeOfflineDownload.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/MakeOfflineDownload.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/codecjorbis-20101023.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/codecjorbis-20101023.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/codecwav-20101023.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/codecwav-20101023.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/lwjgl-egl.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl-egl.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/lwjgl-glfw.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl-glfw.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/lwjgl-jemalloc.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl-jemalloc.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/lwjgl-openal.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl-openal.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/lwjgl-opengles.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl-opengles.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/lwjgl.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/lwjgl.jar"/>
-	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx/desktopRuntime/soundsystem-20120107.jar"/>
+	<classpathentry kind="lib" path="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime/soundsystem-20120107.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

desktopRuntime/eclipseProject/.project

@@ -18,12 +18,12 @@
 		<link>
 			<name>src_lwjgl_java</name>
 			<type>2</type>
-			<location>/workspace/Resent-1.8/eaglercraftx/src/lwjgl/java</location>
+			<location>/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/src/lwjgl/java</location>
 		</link>
 		<link>
 			<name>src_main_java</name>
 			<type>2</type>
-			<location>/workspace/Resent-1.8/eaglercraftx/src/main/java</location>
+			<location>/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/src/main/java</location>
 		</link>
 	</linkedResources>
 </projectDescription>

desktopRuntime/eclipseProject/eaglercraftDebugRuntime.launch

@@ -18,5 +18,5 @@
     <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="eclipseProject"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="eclipseProject"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djava.library.path=."/>
-    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="/workspace/Resent-1.8/eaglercraftx/desktopRuntime"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="/workspace/Resent-1.8/eaglercraftx-1.8/../eaglercraft_1.8_workspace/desktopRuntime"/>
 </launchConfiguration>