[Igarden-commit] Garden/source/resources SourceMaterialsStart.xml, 1.24.2.6, 1.24.2.7 Garden2.rsrc,
Status: Beta
Brought to you by:
jlbedell
Menu
▾
▴
[Igarden-commit] Garden/source/resources SourceMaterialsStart.xml, 1.24.2.6, 1.24.2.7 Garden2.rsrc, 1.33.2.3, 1.33.2.4
|
From: Jeffrey B. <jlb...@us...> - 2006-12-12 00:57:32
|
Update of /cvsroot/igarden/Garden/source/resources In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29898 Modified Files: Tag: Release_branch_v1 SourceMaterialsStart.xml Garden2.rsrc Log Message: Improve performance of startup by only merging source material when changed. Index: SourceMaterialsStart.xml =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/SourceMaterialsStart.xml,v retrieving revision 1.24.2.6 retrieving revision 1.24.2.7 diff -C2 -d -r1.24.2.6 -r1.24.2.7 *** SourceMaterialsStart.xml 15 Nov 2006 04:04:53 -0000 1.24.2.6 --- SourceMaterialsStart.xml 12 Dec 2006 00:57:29 -0000 1.24.2.7 *************** *** 216,220 **** <Variant UID="DB1F3130-D6A0-11DA-AB89-C467FD397B7A" variantName="Snowbank" FlwrColor="white"/> </Material> ! <Material UID="0000BAE9-0000-A106-0000-00030000F59C" CanonicalName="Brassica oleracea" CommonName="Brocolli" materialType="Vegetable" usage=food Spread="45.70cm"> <Variant UID="0000BAE9-0000-A114-0000-00030000F8FA" variantName="Premium Crop"/> </Material> --- 216,220 ---- <Variant UID="DB1F3130-D6A0-11DA-AB89-C467FD397B7A" variantName="Snowbank" FlwrColor="white"/> </Material> ! <Material UID="0000BAE9-0000-A106-0000-00030000F59C" CanonicalName="Brassica oleracea" CommonName="Brocolli" materialType="Vegetable" usage=food Spread="45.70cm" suppliers="0000B7EB-0000-0AF1-0000-00030000E122"> <Variant UID="0000BAE9-0000-A114-0000-00030000F8FA" variantName="Premium Crop"/> </Material> *************** *** 256,260 **** </Material> <Material UID="76891E4E-D64F-11DA-AB89-C467FD397B7A" CanonicalName="Campanula poscharskyana" CommonName="Serbian bellflower" materialType="Perennial" suppliers="0000BA00-0000-5571-0000-000600009860, 0000BA01-0000-5571-0000-000600009860" PlantZone="4a-10" Height="20.30cm" Spread="30.40cm" FlwrColor="blue"/> ! <Material UID="0000BADC-0000-1232-0000-000B0000BA49" CanonicalName="Capsicum annuum" CommonName="Pepper" Spread="60.90cm"> <Variant UID="0000BADD-0000-59B7-0000-003F0000435C" variantName="corno di toro rosso"/> </Material> --- 256,260 ---- </Material> <Material UID="76891E4E-D64F-11DA-AB89-C467FD397B7A" CanonicalName="Campanula poscharskyana" CommonName="Serbian bellflower" materialType="Perennial" suppliers="0000BA00-0000-5571-0000-000600009860, 0000BA01-0000-5571-0000-000600009860" PlantZone="4a-10" Height="20.30cm" Spread="30.40cm" FlwrColor="blue"/> ! <Material UID="0000BADC-0000-1232-0000-000B0000BA49" CanonicalName="Capsicum annuum" CommonName="Pepper" Spread="60.90cm" suppliers="0000B7EB-0000-0AF1-0000-00030000E122"> <Variant UID="0000BADD-0000-59B7-0000-003F0000435C" variantName="corno di toro rosso"/> </Material> *************** *** 371,382 **** <Variant UID="DB1F447C-D6A0-11DA-AB89-C467FD397B7A" variantName="Clara Curtis"/> </Material> ! <Material UID="0000BAE1-0000-54A3-0000-0092000038AD" CanonicalName="Cucumis melo" CommonName="Cantaloupe" materialType="Vegetable" usage=food Spread="1.22m to 1.83m"> <Variant UID="0000BAE1-0000-53B9-0000-0092000001AB" CommonName="Muskmelon" variantName="Blenheim orange heirloom"/> <Variant UID="0000BAE1-0000-54AB-0000-009200003A5D" variantName="vine peach"/> </Material> ! <Material UID="0000BAE1-0000-528B-0000-00910000BAF7" CanonicalName="Cucumis sativus" CommonName="Cucumber" materialType="Vegetable" usage=food Spread="1.22m to 1.52m"> <Variant UID="0000BAE1-0000-5295-0000-00910000BD3A" variantName="Sweet success hyb"/> </Material> ! <Material UID="0000BAA9-0000-EDFF-0000-00980000CEA8" CanonicalName="Cucurbita pepo" CommonName="Bushel gourd" materialType="Vegetable" usage=food Spread="1.83m"> </Material> <Material UID="FA30490E-5B7F-11D9-BB5D-000A95A7588C" CanonicalName="Deschampsia caespitosa" CommonName="tufted hairgrass" materialType="Perennial" suppliers="0000BA00-0000-5571-0000-000600009860, 0000BA01-0000-5571-0000-000600009860" PlantZone="3-3b" Height="91.40cm" Spread="60.90cm" PlantForm="upright oval" GrowthRate="moderate" LifeExp="long lived" SoilPh="strong acid-neutral" SoilTex="sand, sandy loam, loam, clay loam, clay" ShadeTol="full sun" FolTex="medium" FolCol="medium green" AutumnVis="low, none" FlwrColor="yellow" FlwrVis="very low" FruitCol="brown"/> --- 371,382 ---- <Variant UID="DB1F447C-D6A0-11DA-AB89-C467FD397B7A" variantName="Clara Curtis"/> </Material> ! <Material UID="0000BAE1-0000-54A3-0000-0092000038AD" CanonicalName="Cucumis melo" CommonName="Cantaloupe" materialType="Vegetable" usage=food Spread="1.22m to 1.83m" suppliers="0000B7EB-0000-0AF1-0000-00030000E122"> <Variant UID="0000BAE1-0000-53B9-0000-0092000001AB" CommonName="Muskmelon" variantName="Blenheim orange heirloom"/> <Variant UID="0000BAE1-0000-54AB-0000-009200003A5D" variantName="vine peach"/> </Material> ! <Material UID="0000BAE1-0000-528B-0000-00910000BAF7" CanonicalName="Cucumis sativus" CommonName="Cucumber" materialType="Vegetable" usage=food Spread="1.22m to 1.52m" suppliers="0000B7EB-0000-0AF1-0000-00030000E122"> <Variant UID="0000BAE1-0000-5295-0000-00910000BD3A" variantName="Sweet success hyb"/> </Material> ! <Material UID="0000BAA9-0000-EDFF-0000-00980000CEA8" CanonicalName="Cucurbita pepo" CommonName="Bushel gourd" materialType="Vegetable" usage=food Spread="1.83m" suppliers="0000B7EB-0000-0AF1-0000-00030000E122"> </Material> <Material UID="FA30490E-5B7F-11D9-BB5D-000A95A7588C" CanonicalName="Deschampsia caespitosa" CommonName="tufted hairgrass" materialType="Perennial" suppliers="0000BA00-0000-5571-0000-000600009860, 0000BA01-0000-5571-0000-000600009860" PlantZone="3-3b" Height="91.40cm" Spread="60.90cm" PlantForm="upright oval" GrowthRate="moderate" LifeExp="long lived" SoilPh="strong acid-neutral" SoilTex="sand, sandy loam, loam, clay loam, clay" ShadeTol="full sun" FolTex="medium" FolCol="medium green" AutumnVis="low, none" FlwrColor="yellow" FlwrVis="very low" FruitCol="brown"/> *************** *** 697,701 **** <Variant UID="5D11B40E-D6A3-11DA-AB89-C467FD397B7A" variantName="Kobold" FlwrColor="lavander" FruitCol="brown"/> </Material> ! <Material UID="0000BAE7-0000-E95A-0000-004D0000D972" CanonicalName="Lagenaria siceraria" CommonName="gourd" materialType="Vegetable" usage=food Spread="1.83m"> <Variant UID="0000BAE7-0000-E966-0000-004D0000DC4A" variantName="birdhouse"/> </Material> --- 697,701 ---- <Variant UID="5D11B40E-D6A3-11DA-AB89-C467FD397B7A" variantName="Kobold" FlwrColor="lavander" FruitCol="brown"/> </Material> ! <Material UID="0000BAE7-0000-E95A-0000-004D0000D972" CanonicalName="Lagenaria siceraria" CommonName="gourd" materialType="Vegetable" usage=food Spread="1.83m" suppliers="0000B7EB-0000-0AF1-0000-00030000E122"> <Variant UID="0000BAE7-0000-E966-0000-004D0000DC4A" variantName="birdhouse"/> </Material> *************** *** 719,723 **** <Material UID="FA339B8A-5B7F-11D9-BB5D-000A95A7588C" CanonicalName="Lonicera tatarica" CommonName="Tatarian honeysuckle" materialType="DeciduousShrub" suppliers="0000BA00-0000-5571-0000-000600009860, 0000BA01-0000-5571-0000-000600009860" PlantZone="3-3b" Height="3.05m" Spread="3.05m" PlantForm="globular" GrowthRate="fast" LifeExp="medium lived" SoilPh="moderate acid-alkaline" SoilTex="sand, sandy loam, loam" FolTex="coarse" FolCol="medium green" AutumnVis="low, none" FruitCol="red"/> <Material UID="FA33A85E-5B7F-11D9-BB5D-000A95A7588C" CanonicalName="Lotus corniculatus" CommonName="birdfoot Trefoil" materialType="Perennial" suppliers="0000BA00-0000-5571-0000-000600009860, 0000BA01-0000-5571-0000-000600009860" PlantZone="3-3b" Height="30.40cm" Spread="45.70cm" PlantForm="weeping" GrowthRate="moderate" LifeExp="medium lived" SoilPh="moderate acid-alkaline" SoilTex="sand, sandy loam, loam, clay loam, clay" ShadeTol="full sun" FolTex="fine" FolCol="medium green" AutumnVis="low, none" FlwrColor="yellow" FruitCol="brown"/> ! <Material UID="0000BAE7-0000-233C-0000-00110000FA35" CanonicalName="Luffa cylindrica" CommonName="gourd" materialType="Vegetable" usage=food Spread="1.22m"> <Variant UID="0000BAE7-0000-2368-0000-001200000470" variantName="luffa sponge"/> </Material> --- 719,723 ---- <Material UID="FA339B8A-5B7F-11D9-BB5D-000A95A7588C" CanonicalName="Lonicera tatarica" CommonName="Tatarian honeysuckle" materialType="DeciduousShrub" suppliers="0000BA00-0000-5571-0000-000600009860, 0000BA01-0000-5571-0000-000600009860" PlantZone="3-3b" Height="3.05m" Spread="3.05m" PlantForm="globular" GrowthRate="fast" LifeExp="medium lived" SoilPh="moderate acid-alkaline" SoilTex="sand, sandy loam, loam" FolTex="coarse" FolCol="medium green" AutumnVis="low, none" FruitCol="red"/> <Material UID="FA33A85E-5B7F-11D9-BB5D-000A95A7588C" CanonicalName="Lotus corniculatus" CommonName="birdfoot Trefoil" materialType="Perennial" suppliers="0000BA00-0000-5571-0000-000600009860, 0000BA01-0000-5571-0000-000600009860" PlantZone="3-3b" Height="30.40cm" Spread="45.70cm" PlantForm="weeping" GrowthRate="moderate" LifeExp="medium lived" SoilPh="moderate acid-alkaline" SoilTex="sand, sandy loam, loam, clay loam, clay" ShadeTol="full sun" FolTex="fine" FolCol="medium green" AutumnVis="low, none" FlwrColor="yellow" FruitCol="brown"/> ! <Material UID="0000BAE7-0000-233C-0000-00110000FA35" CanonicalName="Luffa cylindrica" CommonName="gourd" materialType="Vegetable" usage=food Spread="1.22m" suppliers="0000B7EB-0000-0AF1-0000-00030000E122"> <Variant UID="0000BAE7-0000-2368-0000-001200000470" variantName="luffa sponge"/> </Material> *************** *** 1293,1300 **** <Material UID="F1FE0306-ED5B-488B-AB49-3539D57C3C0B" CommonName="Small Pool 1" materialType="Water" Height="1in" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="KidneyPool.svg"/> <Material UID="F1FE0306-ED5B-488B-AB49-3539D57C3C0B" CommonName="Sundial" materialType="Accent" Height="2ft" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="Sundial.svg"/> ! <Material UID="01234683-0000-E73E-0000-0A00000065F1" CommonName="Turf" materialType="Background" MaterialLength="20.30cm" MaterialWidth="20.30cm" Picture="turf.png"/> ! <Material UID="01234684-0000-E73E-0000-0A00000065F1" CommonName="Asphalt" materialType="Background" MaterialLength="20.30cm" MaterialWidth="20.30cm" Picture="blacktop.png"/> ! <Material UID="01234685-0000-E73E-0000-0A00000065F1" CommonName="Tile" materialType="Background" MaterialLength="20.30cm" MaterialWidth="20.30cm" Picture="tilefloor.png"/> ! <Material UID="01234686-0000-E73E-0000-0A00000065F1" CommonName="Wood Chips" materialType="Mulch" Height="5cm" MaterialLength="40.60cm" MaterialWidth="40.60cm" Picture="dirt.png"/> </Materials> </iGardenSource> \ No newline at end of file --- 1293,1300 ---- <Material UID="F1FE0306-ED5B-488B-AB49-3539D57C3C0B" CommonName="Small Pool 1" materialType="Water" Height="1in" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="KidneyPool.svg"/> <Material UID="F1FE0306-ED5B-488B-AB49-3539D57C3C0B" CommonName="Sundial" materialType="Accent" Height="2ft" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="Sundial.svg"/> ! <Material UID="01234683-0000-E73E-0000-0A00000065F1" CommonName="Turf" materialType="Background" MaterialLength="20.30cm" MaterialWidth="20.30cm" Picture="turf.png" suppliers="0000B7EB-0000-0AF1-0000-00030000E122"/> ! <Material UID="01234684-0000-E73E-0000-0A00000065F1" CommonName="Asphalt" materialType="Background" MaterialLength="20.30cm" MaterialWidth="20.30cm" Picture="blacktop.png" suppliers="0000B7EB-0000-0AF1-0000-00030000E122"/> ! <Material UID="01234685-0000-E73E-0000-0A00000065F1" CommonName="Tile" materialType="Background" MaterialLength="20.30cm" MaterialWidth="20.30cm" Picture="tilefloor.png" suppliers="0000B7EB-0000-0AF1-0000-00030000E122"/> ! <Material UID="01234686-0000-E73E-0000-0A00000065F1" CommonName="Wood Chips" materialType="Mulch" Height="5cm" MaterialLength="40.60cm" MaterialWidth="40.60cm" Picture="dirt.png" suppliers="0000B7EB-0000-0AF1-0000-00030000E122"/> </Materials> </iGardenSource> \ No newline at end of file Index: Garden2.rsrc =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/Garden2.rsrc,v retrieving revision 1.33.2.3 retrieving revision 1.33.2.4 diff -C2 -d -r1.33.2.3 -r1.33.2.4 Binary files /tmp/cvsfzS8dP and /tmp/cvsbUd0Mb differ |