2.3.3-r

• update zh_cn.lang
• revert the energy consumption of fluid i/o in discretizer
• add button to merge the same items
• fix drops leaking to item cells when canceling a crafting job with discretizer offline