diff --git a/CropPlanning/Release Notes.txt b/CropPlanning/Release Notes.txt index 78b5009..c3c5df8 100755 --- a/CropPlanning/Release Notes.txt +++ b/CropPlanning/Release Notes.txt @@ -13,7 +13,6 @@ but do expect some bumps along the way. **Back up your data files frequently!** ### Enhancements -* Crop plans can now be exported to a Google Calendar. (*experimental, but fun*) * Support for DD/MM/YYYY style dates. 🇬🇧 🇦🇺 * searching and filtering can now be done by specific field * eg, filtering for `name:winter` will just show crops with "Winter" in their name (like "Winter Squash"), while `var:winter` will just show varieties with "winter" in their name (like "Wintebor") diff --git a/CropPlanning/appinfo.properties b/CropPlanning/appinfo.properties index f9ac3d1..cccab9d 100644 --- a/CropPlanning/appinfo.properties +++ b/CropPlanning/appinfo.properties @@ -1,10 +1,10 @@ #Everything can be manually updated except buildnum and builddate. -#Mon, 08 Feb 2016 15:10:21 -0500 +#Mon, 08 Feb 2016 15:34:43 -0500 #Wed Feb 17 22:10:07 EST 2010 program.PROGNAME=CPS.CropPlanning -program.BUILDNUM=155 +program.BUILDNUM=156 program.AUTHOR=Clayton Carter -program.BUILDDATE=20160239151021 +program.BUILDDATE=20160239153443 program.DESCRIPTION=Crop Planning Software program.COPYRIGHT=2013 program.VERSION=0.7.0 diff --git a/CropPlanning/build.xml b/CropPlanning/build.xml index f9b2121..ee46c41 100644 --- a/CropPlanning/build.xml +++ b/CropPlanning/build.xml @@ -198,9 +198,9 @@ ]]>${program.DESCRIPTION} Version ${program.VERSION}<![CDATA[ ]]>${current.date} ]]>http://www.failbetterfarm.com/cps/ReleaseNotes${program.VERSION}.html - url="http://cropplanning.googlecode.com/files/${dmg.file}" sparkle:os="mac" sparkle:version="${program.BUILDNUM}" sparkle:shortVersionString="${program.VERSION}" length="${dmg.length}" type="application/octet-stream" sparkle:dsaSignature="" sparkle:md5Sum="${dmg.checksum}" - url="http://cropplanning.googlecode.com/files/${zip.win.file}" sparkle:os="win" sparkle:version="${program.BUILDNUM}" sparkle:shortVersionString="${program.VERSION}" length="${zip.win.length}" type="application/octet-stream" sparkle:dsaSignature="" sparkle:md5Sum="${zip.win.checksum}" - url="http://cropplanning.googlecode.com/files/${zip.file}" sparkle:os="all" sparkle:version="${program.BUILDNUM}" sparkle:shortVersionString="${program.VERSION}" length="${zip.length}" type="application/octet-stream" sparkle:dsaSignature="" sparkle:md5Sum="${zip.checksum}" + url="https://github.com/claytonrcarter/cropplanning/releases/download/v${version.prop}/${dmg.file}" sparkle:os="mac" sparkle:version="${program.BUILDNUM}" sparkle:shortVersionString="${program.VERSION}" length="${dmg.length}" type="application/octet-stream" sparkle:dsaSignature="" sparkle:md5Sum="${dmg.checksum}" + url="https://github.com/claytonrcarter/cropplanning/releases/download/v${version.prop}/${zip.win.file}" sparkle:os="win" sparkle:version="${program.BUILDNUM}" sparkle:shortVersionString="${program.VERSION}" length="${zip.win.length}" type="application/octet-stream" sparkle:dsaSignature="" sparkle:md5Sum="${zip.win.checksum}" + url="https://github.com/claytonrcarter/cropplanning/releases/download/v${version.prop}/${zip.file}" sparkle:os="all" sparkle:version="${program.BUILDNUM}" sparkle:shortVersionString="${program.VERSION}" length="${zip.length}" type="application/octet-stream" sparkle:dsaSignature="" sparkle:md5Sum="${zip.checksum}" ]]> diff --git a/CropPlanning/buildnumber.properties b/CropPlanning/buildnumber.properties index 785e1e9..63783c6 100644 --- a/CropPlanning/buildnumber.properties +++ b/CropPlanning/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Mon Feb 08 15:10:21 EST 2016 -build.number=156 +#Mon Feb 08 15:34:43 EST 2016 +build.number=157 diff --git a/CropPlanning/src/CPS/Core/TODOLists/TODOLists.java b/CropPlanning/src/CPS/Core/TODOLists/TODOLists.java index b77ac6d..274d02d 100644 --- a/CropPlanning/src/CPS/Core/TODOLists/TODOLists.java +++ b/CropPlanning/src/CPS/Core/TODOLists/TODOLists.java @@ -206,7 +206,7 @@ else if ( filFile.getSelectedFile().getPath() == null ) { cmbWhatToExport.addItem( TL_ALL_PLANTINGS ); cmbWhatToExport.addItem( TL_SEED_ORDER_WORKSHEET ); cmbWhatToExport.addItem( TL_HARVEST_AVAILABILITY ); - cmbWhatToExport.addItem( TL_GOOGLE_CAL ); +// cmbWhatToExport.addItem( TL_GOOGLE_CAL ); cmbWhatToExport.addItemListener(this); lblExportDesc = new JLabel( DSC_START + DSC_GH_SEEDING + DSC_END );