anttix

diff --git a/config/examples/MPCNC/Archim2_T8_16T_LCD_16step/Configuration.h b/config/examples/MPCNC/Archim2_T8_16T_LCD_16step/Configuration.h
index 5dfd6c3..67e6ecb 100644
--- a/config/examples/MPCNC/Archim2_T8_16T_LCD_16step/Configuration.h
+++ b/config/examples/MPCNC/Archim2_T8_16T_LCD_16step/Configuration.h
@@ -71,7 +71,7 @@
 // @section info
 
 // Author info of this build printed to the host during boot and M115
-#define STRING_CONFIG_H_AUTHOR "(V1 Engineering, Ryan, 402)" // Who made the changes.
+#define STRING_CONFIG_H_AUTHOR "(V1 Engineering, Ryan, 414)" // Who made the changes.

anttix

Files in conflict for method 1 and 2:

config/examples/MPCNC/Archim2_T8_16T_LCD_16step/Configuration.h
config/examples/MPCNC/Archim2_T8_16T_LCD_16step/Configuration_adv.h
config/examples/ZenXY/MiniRambo_16T/Configuration.h
config/examples/ZenXY/MiniRambo_16T/Configuration_adv.h
config/examples/ZenXY/Ramps_16T_LCD_32/Configuration.h
config/examples/ZenXY/Ramps_16T_LCD_32/Configuration_adv.h

Files in conflict for method 3:

anttix

Apply to bugfix-2.0.x b119c1401749037bc23352633f629268217ee5bf

---
 Marlin/Configuration.h     | 80 ++++++++++++++++++++++++----------------------
 Marlin/Configuration_adv.h | 60 +++++++++++++++++-----------------
 Marlin/src/inc/Version.h   |  2 +-
 3 files changed, 72 insertions(+), 70 deletions(-)

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index fa5d270..4bd312d 100644

anttix

diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index fa5d270..4de190c 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -143,7 +143,7 @@
 
 // This defines the number of extruders
 // :[1, 2, 3, 4, 5, 6]
-#define EXTRUDERS 1
+#define EXTRUDERS 0

anttix

import java.io.InputStreamReader;
import java.net.URL;
import java.util.Date;

public class UnbufferedClient {
	public static void main(String[] args) throws Exception {
		URL u = new URL("http://localhost:8080/testapp/AsyncServlet");
		InputStreamReader r = new InputStreamReader(u.openConnection().getInputStream());
		char [] buf = new char[1024];
		int n;