Macadamia industry in better shape after two-year price fall