Skip to content

Commit

Permalink
Add two new crop sets and delete the oreo set since there is a bigger…
Browse files Browse the repository at this point in the history
… more up to date set in the Oreons module
  • Loading branch information
Cervator committed Jan 23, 2014
1 parent 29005c0 commit c099676
Show file tree
Hide file tree
Showing 34 changed files with 348 additions and 12 deletions.
Binary file added assets/blockTiles/HotCoffeePlant1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/blockTiles/HotCoffeePlant2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/blockTiles/HotCoffeePlant3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/blockTiles/HotCoffeePlant4.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/blockTiles/HotCoffeePlant5.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/blockTiles/HotCoffeePlant6.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/blockTiles/HotCoffeePlant7.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/blockTiles/MilkPlant1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/blockTiles/MilkPlant2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/blockTiles/MilkPlant3.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/blockTiles/MilkPlant4.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/blockTiles/MilkPlant5.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/blockTiles/MilkPlant6.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/blockTiles/MilkPlant7.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/blockTiles/Oreo1.png
Binary file not shown.
Binary file removed assets/blockTiles/Oreo2.png
Binary file not shown.
Binary file removed assets/blockTiles/Oreo3.png
Binary file not shown.
Binary file removed assets/blockTiles/Oreo4.png
Binary file not shown.
@@ -1,5 +1,5 @@
/*
* Copyright 2013 Moving Blocks
* Copyright 2014 Moving Blocks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,14 +15,14 @@
*/

/**
* Oreo plant in various stages of its life-cycle. Yes, Oreo plant ;-)
* A plant that grows mugs of hot coffee!
* @author (art) metouto
*/
{
"author" : "metouto",
"basedOn" : "core:plant",
"entity" : {
"prefab" : "Crops:Oreo",
"prefab" : "Crops:HotCoffeePlant",
"keepActive" : true
}
}
@@ -1,5 +1,5 @@
/*
* Copyright 2013 Moving Blocks
* Copyright 2014 Moving Blocks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,14 +15,14 @@
*/

/**
* Oreo plant in various stages of its life-cycle. Yes, Oreo plant ;-)
* A plant that grows mugs of hot coffee!
* @author (art) metouto
*/
{
"author" : "metouto",
"basedOn" : "core:plant",
"entity" : {
"prefab" : "Crops:Oreo",
"prefab" : "Crops:HotCoffeePlant",
"keepActive" : true
}
}
@@ -1,5 +1,5 @@
/*
* Copyright 2013 Moving Blocks
* Copyright 2014 Moving Blocks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,14 +15,14 @@
*/

/**
* Oreo plant in various stages of its life-cycle. Yes, Oreo plant ;-)
* A plant that grows mugs of hot coffee!
* @author (art) metouto
*/
{
"author" : "metouto",
"basedOn" : "core:plant",
"entity" : {
"prefab" : "Crops:Oreo",
"prefab" : "Crops:HotCoffeePlant",
"keepActive" : true
}
}
@@ -1,5 +1,5 @@
/*
* Copyright 2013 Moving Blocks
* Copyright 2014 Moving Blocks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,14 +15,14 @@
*/

/**
* Oreo plant in various stages of its life-cycle. Yes, Oreo plant ;-)
* A plant that grows mugs of hot coffee!
* @author (art) metouto
*/
{
"author" : "metouto",
"basedOn" : "core:plant",
"entity" : {
"prefab" : "Crops:Oreo",
"prefab" : "Crops:HotCoffeePlant",
"keepActive" : true
}
}
28 changes: 28 additions & 0 deletions assets/blocks/HotCoffeePlant5.block
@@ -0,0 +1,28 @@
/*
* Copyright 2014 Moving Blocks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/**
* A plant that grows mugs of hot coffee!
* @author (art) metouto
*/
{
"author" : "metouto",
"basedOn" : "core:plant",
"entity" : {
"prefab" : "Crops:HotCoffeePlant",
"keepActive" : true
}
}
28 changes: 28 additions & 0 deletions assets/blocks/HotCoffeePlant6.block
@@ -0,0 +1,28 @@
/*
* Copyright 2014 Moving Blocks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/**
* A plant that grows mugs of hot coffee!
* @author (art) metouto
*/
{
"author" : "metouto",
"basedOn" : "core:plant",
"entity" : {
"prefab" : "Crops:HotCoffeePlant",
"keepActive" : true
}
}
28 changes: 28 additions & 0 deletions assets/blocks/HotCoffeePlant7.block
@@ -0,0 +1,28 @@
/*
* Copyright 2014 Moving Blocks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/**
* A plant that grows mugs of hot coffee!
* @author (art) metouto
*/
{
"author" : "metouto",
"basedOn" : "core:plant",
"entity" : {
"prefab" : "Crops:HotCoffeePlant",
"keepActive" : true
}
}
28 changes: 28 additions & 0 deletions assets/blocks/MilkPlant1.block
@@ -0,0 +1,28 @@
/*
* Copyright 2014 Moving Blocks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/**
* A plant that grows glasses of delicious cold milk
* @author (art) metouto
*/
{
"author" : "metouto",
"basedOn" : "core:plant",
"entity" : {
"prefab" : "Crops:MilkPlant",
"keepActive" : true
}
}
28 changes: 28 additions & 0 deletions assets/blocks/MilkPlant2.block
@@ -0,0 +1,28 @@
/*
* Copyright 2014 Moving Blocks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/**
* A plant that grows glasses of delicious cold milk
* @author (art) metouto
*/
{
"author" : "metouto",
"basedOn" : "core:plant",
"entity" : {
"prefab" : "Crops:MilkPlant",
"keepActive" : true
}
}
28 changes: 28 additions & 0 deletions assets/blocks/MilkPlant3.block
@@ -0,0 +1,28 @@
/*
* Copyright 2014 Moving Blocks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/**
* A plant that grows glasses of delicious cold milk
* @author (art) metouto
*/
{
"author" : "metouto",
"basedOn" : "core:plant",
"entity" : {
"prefab" : "Crops:MilkPlant",
"keepActive" : true
}
}
28 changes: 28 additions & 0 deletions assets/blocks/MilkPlant4.block
@@ -0,0 +1,28 @@
/*
* Copyright 2014 Moving Blocks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/**
* A plant that grows glasses of delicious cold milk
* @author (art) metouto
*/
{
"author" : "metouto",
"basedOn" : "core:plant",
"entity" : {
"prefab" : "Crops:MilkPlant",
"keepActive" : true
}
}
28 changes: 28 additions & 0 deletions assets/blocks/MilkPlant5.block
@@ -0,0 +1,28 @@
/*
* Copyright 2014 Moving Blocks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/**
* A plant that grows glasses of delicious cold milk
* @author (art) metouto
*/
{
"author" : "metouto",
"basedOn" : "core:plant",
"entity" : {
"prefab" : "Crops:MilkPlant",
"keepActive" : true
}
}
28 changes: 28 additions & 0 deletions assets/blocks/MilkPlant6.block
@@ -0,0 +1,28 @@
/*
* Copyright 2014 Moving Blocks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/**
* A plant that grows glasses of delicious cold milk
* @author (art) metouto
*/
{
"author" : "metouto",
"basedOn" : "core:plant",
"entity" : {
"prefab" : "Crops:MilkPlant",
"keepActive" : true
}
}
28 changes: 28 additions & 0 deletions assets/blocks/MilkPlant7.block
@@ -0,0 +1,28 @@
/*
* Copyright 2014 Moving Blocks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

/**
* A plant that grows glasses of delicious cold milk
* @author (art) metouto
*/
{
"author" : "metouto",
"basedOn" : "core:plant",
"entity" : {
"prefab" : "Crops:MilkPlant",
"keepActive" : true
}
}

0 comments on commit c099676

Please sign in to comment.