It should be "which". "That" requires either a period and a new sentence, or a semi-colon.

While Susan612 is right for all technical grammatical purposes, many people would say "that" while speaking, so if you're talking to someone and say "that" instead, it's perfectly okay. However if this is for a grammar class, then stick with "which".