merged % done changes from CES branch

makerbot · Jan 12, 2012 · 52ecf58 · 52ecf58
1 parent 759897f
commit 52ecf58
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,6 @@
+0030_CES ReplicatorG
+* packaged for CES
+
 0029_r2 ReplicatorG
 * Fixed problem with Raft in Print-O-Matic settings
 

diff --git a/src/replicatorg/plugin/toolpath/skeinforge/SkeinforgePostProcessor.java b/src/replicatorg/plugin/toolpath/skeinforge/SkeinforgePostProcessor.java
@@ -208,6 +208,7 @@ protected BuildCode runPostProcessing()
 		return generator.output;
 	}
 
+<<<<<<< HEAD
 	private String getPrettyPrintDate()
 	{
 		DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss (Z)");
@@ -216,6 +217,12 @@ private String getPrettyPrintDate()
 		return dateFormat.format(date);
 
 
+=======
+	// put 
+	private void runAddProgressUpdates()
+	{
+		source.addProgressUpdates();
+>>>>>>> 8b5d998... Fixed version string in changelog, added build % to dualstrusion.
 	}
 
 	/**
@@ -391,10 +398,13 @@ public void setMultiHead(boolean isMulti)
 		multiHead = isMulti;
 		ppp.refreshPreferences();
 	}
+<<<<<<< HEAD
 	/**
 	 * toggles the addition of build % messages, displayable on The Replicator
 	 * @param doAdd
 	 */
+=======
+>>>>>>> 8b5d998... Fixed version string in changelog, added build % to dualstrusion.
 	public void setAddProgressUpdates(boolean doAdd)
 	{
 		addProgressUpdates = doAdd;