Skip to content

Commit ef68b18

Browse files
cabbagecreekcabbagecreek
committed
Merge branch 'develop'
2 parents d21ee2b + 58810d8 commit ef68b18

File tree

38 files changed

+1167
-966
lines changed

38 files changed

+1167
-966
lines changed

‎Marlin3DprinterTool/.vs/Marlin3DprinterTool/v15/sqlite3/storage.ide

-2.45 MB
Binary file not shown.

‎Marlin3DprinterTool/ArduinoIDE/obj/x86/Debug/ArduinoIDE.csproj.FileListAbsolute.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\Ardu
2727
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\ArduinoIDE\obj\x86\Debug\ArduinoIDE.Properties.Resources.resources
2828
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\ArduinoIDE\obj\x86\Debug\ArduinoIDE.TestArduinoIDE.resources
2929
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\ArduinoIDE\obj\x86\Debug\ArduinoIDE.csproj.GenerateResource.Cache
30+
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\ArduinoIDE\obj\x86\Debug\ArduinoIDE.csproj.CoreCompileInputs.cache
3031
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\ArduinoIDE\obj\x86\Debug\ArduinoIDE.exe
3132
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\ArduinoIDE\obj\x86\Debug\ArduinoIDE.pdb
32-
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\ArduinoIDE\obj\x86\Debug\ArduinoIDE.csproj.CoreCompileInputs.cache

‎Marlin3DprinterTool/ArduinoIDE/obj/x86/Release/ArduinoIDE.csproj.FileListAbsolute.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,4 @@ C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\Ardu
5959
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\ArduinoIDE\obj\x86\Release\ArduinoIDE.csproj.GenerateResource.Cache
6060
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\ArduinoIDE\obj\x86\Release\ArduinoIDE.exe
6161
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\ArduinoIDE\obj\x86\Release\ArduinoIDE.pdb
62+
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\ArduinoIDE\obj\x86\Release\ArduinoIDE.csproj.CoreCompileInputs.cache

‎Marlin3DprinterTool/AutoUpdater/obj/x86/Debug/AutoUpdater.csproj.FileListAbsolute.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\AutoUpdater\bin\x86\Debug\AutoUpdater.dll
22
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\AutoUpdater\bin\x86\Debug\AutoUpdater.pdb
3+
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\AutoUpdater\obj\x86\Debug\AutoUpdater.csprojResolveAssemblyReference.cache
34
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\AutoUpdater\obj\x86\Debug\AutoUpdater.FrmAutoUpdate.resources
45
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\AutoUpdater\obj\x86\Debug\AutoUpdater.csproj.GenerateResource.Cache
6+
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\AutoUpdater\obj\x86\Debug\AutoUpdater.csproj.CoreCompileInputs.cache
57
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\AutoUpdater\obj\x86\Debug\AutoUpdater.dll
68
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\AutoUpdater\obj\x86\Debug\AutoUpdater.pdb
7-
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\AutoUpdater\obj\x86\Debug\AutoUpdater.csprojResolveAssemblyReference.cache
8-
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\AutoUpdater\obj\x86\Debug\AutoUpdater.csproj.CoreCompileInputs.cache

‎Marlin3DprinterTool/AutoUpdater/obj/x86/Release/AutoUpdater.csproj.FileListAbsolute.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\Auto
1111
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\AutoUpdater\obj\x86\Release\AutoUpdater.csproj.GenerateResource.Cache
1212
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\AutoUpdater\obj\x86\Release\AutoUpdater.dll
1313
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\AutoUpdater\obj\x86\Release\AutoUpdater.pdb
14-
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\AutoUpdater\obj\x86\Release\AutoUpdater.csprojResolveAssemblyReference.cache
14+
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\AutoUpdater\obj\x86\Release\AutoUpdater.csproj.CoreCompileInputs.cache

‎Marlin3DprinterTool/InstallMarlin3DprinterTool/bin/Debug/Marlin3DprinterTool.ism

-5.5 MB
Binary file not shown.

‎Marlin3DprinterTool/InstallMarlin3DprinterTool/bin/Debug/Marlin3DprinterTool.wixpdb

1 Byte
Binary file not shown.

‎Marlin3DprinterTool/Marlin3DprinterStlViewer/obj/x86/Debug/Marlin3DprinterStlViewer.csproj.FileListAbsolute.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\Marl
3131
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\Marlin3DprinterStlViewer\obj\x86\Debug\Marlin3DprinterStlViewer.FrmStlViewer.resources
3232
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\Marlin3DprinterStlViewer\obj\x86\Debug\Marlin3DprinterStlViewer.Properties.Resources.resources
3333
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\Marlin3DprinterStlViewer\obj\x86\Debug\Marlin3DprinterStlViewer.csproj.GenerateResource.Cache
34+
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\Marlin3DprinterStlViewer\obj\x86\Debug\Marlin3DprinterStlViewer.csproj.CoreCompileInputs.cache
3435
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\Marlin3DprinterStlViewer\obj\x86\Debug\Marlin3DprinterStlViewer.exe
3536
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\Marlin3DprinterStlViewer\obj\x86\Debug\Marlin3DprinterStlViewer.pdb
36-
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\Marlin3DprinterStlViewer\obj\x86\Debug\Marlin3DprinterStlViewer.csproj.CoreCompileInputs.cache

‎Marlin3DprinterTool/Marlin3DprinterStlViewer/obj/x86/Release/Marlin3DprinterStlViewer.csproj.FileListAbsolute.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,4 @@ C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\Marl
6868
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\Marlin3DprinterStlViewer\obj\x86\Release\Marlin3DprinterStlViewer.csproj.GenerateResource.Cache
6969
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\Marlin3DprinterStlViewer\obj\x86\Release\Marlin3DprinterStlViewer.exe
7070
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\Marlin3DprinterStlViewer\obj\x86\Release\Marlin3DprinterStlViewer.pdb
71+
C:\Users\Johnnyboy\Documents\GitHub\Marlin3DprinterTool\Marlin3DprinterTool\Marlin3DprinterStlViewer\obj\x86\Release\Marlin3DprinterStlViewer.csproj.CoreCompileInputs.cache

‎Marlin3DprinterTool/Marlin3DprinterStlViewer/obj/x86/Release/STLviewerWPF.g.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#pragma checksum "..\..\..\STLviewerWPF.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "CE3F58B8B99CEE50579281EA9002F019"
1+
#pragma checksum "..\..\..\STLviewerWPF.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "5E9E0FF3E6B07EFCDCD7E8EAF79D3D776A3C63AA"
22
//------------------------------------------------------------------------------
33
// <auto-generated>
44
// This code was generated by a tool.

0 commit comments

Comments
 (0)