Here are some great activities and printables for teaching 2D and 3D shapes.
Castle Shapes- sorting 2D and 3D shapes
Castle Shapes 2- identifying shapes and sorting on Venn diagram
Castle Shapes 3- label 3D shapes and sorting on Venn diagram
Castle Shapes 4- identify properties of 3D shapes
Shapes- 2D and 3D with information & printable worksheets
Shape Shooter- 8 levels
There are also some great resources here on the Crickweb site here
but they must be opened from their site so I can't link directly to them.
Below are some great printable 2D and 3D resources from
and from Sparklebox 2