New version 13.11.2

This commit is contained in:
Miro Hrončok 2013-12-14 23:29:37 +01:00
commit 57c3faec98
5 changed files with 51 additions and 7 deletions

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
/Cura-13.03-linux-fedora.tar.gz
/Cura-13.04-linux-fedora.tar.gz
/Cura-13.10-fedora.tar.gz
/Cura-13.11.2-fedora.tar.gz

View file

@ -1,8 +1,8 @@
diff --git a/gui/sceneView.py b/gui/sceneView.py
index ead3086..a4f9fb3 100644
index d609cd0..8696b71 100644
--- a/gui/sceneView.py
+++ b/gui/sceneView.py
@@ -1201,70 +1201,16 @@ void main(void)
@@ -1233,70 +1233,16 @@ void main(void)
size = [profile.getMachineSettingFloat('machine_width'), profile.getMachineSettingFloat('machine_depth'), profile.getMachineSettingFloat('machine_height')]
machine = profile.getMachineSetting('machine_type')
@ -81,5 +81,5 @@ index ead3086..a4f9fb3 100644
+ glVertex3f(-size[0] / 2, -size[1] / 2+10, 0)
+ glEnd()
#Cornerpoints for big blue square
v0 = [ size[0] / 2, size[1] / 2, size[2]]
v1 = [ size[0] / 2,-size[1] / 2, size[2]]

View file

@ -0,0 +1,35 @@
From 7884cd29c46d270c5e101f5ddb2c122ad513fe43 Mon Sep 17 00:00:00 2001
From: daid <daid303@gmail.com>
Date: Thu, 21 Nov 2013 22:49:02 +0100
Subject: [PATCH] Cura 13.11.2 fails to startup without dual-extrusion. Fuck.
---
Cura/gui/mainWindow.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py
index d5b27a7..d58b3a6 100644
--- a/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@ -153,6 +153,8 @@ def __init__(self):
if self.extruderCount > 1:
self.headOffsetWizardMenuItem = expertMenu.Append(-1, _("Run head offset wizard..."))
self.Bind(wx.EVT_MENU, self.OnHeadOffsetWizard, self.headOffsetWizardMenuItem)
+ else:
+ self.headOffsetWizardMenuItem = None
self.menubar.Append(expertMenu, _("Expert"))
@@ -308,7 +310,8 @@ def updateSliceMode(self):
self.defaultFirmwareInstallMenuItem.Enable(firmwareInstall.getDefaultFirmware() is not None)
if profile.getMachineSetting('machine_type') == 'ultimaker2':
self.bedLevelWizardMenuItem.Enable(False)
- self.headOffsetWizardMenuItem.Enable(False)
+ if self.headOffsetWizardMenuItem is not None:
+ self.headOffsetWizardMenuItem.Enable(False)
self.scene.updateProfileToControls()
def OnPreferences(self, e):
--
1.8.5.1

View file

@ -1,5 +1,5 @@
Name: cura
Version: 13.10
Version: 13.11.2
Release: 1%{?dist}
Summary: 3D printer control software
@ -27,6 +27,10 @@ Patch1: %{name}-CuraEngine.patch
# UltimakerPlatforms STLs were stripped from the tarball, don't crash because of that
Patch2: %{name}-dont-show-nc-stls.patch
# FIX: Cura crashes when Ultimaker2 is chosen
# https://github.com/daid/Cura/commit/7884cd29c46d270c5e101f5ddb2c122ad513fe43
Patch3: %{name}-ultimaker2-crash.patch
BuildArch: noarch
BuildRequires: python2-devel
BuildRequires: dos2unix
@ -38,8 +42,8 @@ Requires: numpy
Requires: python-power
Requires: pypy
Requires: ultimaker-marlin-firmware >= 13
Requires: ultimaker2-marlin-firmware >= 13
Requires: CuraEngine >= 13
Requires: ultimaker2-marlin-firmware >= 13.11-2
Requires: CuraEngine >= 13.11.2
%description
Cura is a project which aims to be an single software solution for 3D printing.
@ -55,6 +59,7 @@ settings and send this G-Code to the 3D printer for printing.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p2
dos2unix resources/example/Attribution.txt
@ -89,6 +94,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
%{_bindir}/%{name}
%changelog
* Sat Dec 14 2013 Miro Hrončok <mhroncok@redhat.com> - 13.11.2-1
- New version 13.11.2
* Wed Oct 16 2013 Miro Hrončok <mhroncok@redhat.com> - 13.10-1
- New upstream release with CuraEngine

View file

@ -1 +1 @@
9bde9f6f9ab60c7a76098bf2204e24b3 Cura-13.10-fedora.tar.gz
c58cdd3834d719fbd5a905d9b2154730 Cura-13.11.2-fedora.tar.gz