Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Luis C.M. committed 2024-08-05 19:40:54 -05:00
commit b8a2b4d386
2 files changed
+11 -11

No files matched your search

@@ -52,7 +52,6 @@ public class ModelMPM extends ModelNPCMale{
public ModelRenderer bipedRightLegWear;
public ModelRenderer bipedLeftLegWear;
private ModelLegs legs;
private ModelScaleRenderer headwear;
private ModelScaleRenderer bodywear;
private final ModelScaleRenderer solidLeftArmWear;
@@ -60,7 +59,8 @@ public class ModelMPM extends ModelNPCMale{
private final ModelScaleRenderer solidLeftLegWear;
private final ModelScaleRenderer solidRightLegWear;
private ModelTail tail;
public ModelLegs legs;
public ModelTail tail;
public ModelBase entityModel;
public EntityLivingBase entity;
@@ -19,15 +19,15 @@ public class ModelTail extends ModelScaleRenderer {
private EntityCustomNpc entity;
private ModelMPM base;
private ModelRenderer tail;
private ModelRenderer dragon;
private ModelRenderer squirrel;
private ModelRenderer horse;
private ModelRenderer fin;
private ModelRenderer rodent;
private ModelRenderer feather;
private ModelCanineTail fox;
private ModelMonkeyTail monkey;
public ModelRenderer tail;
public ModelRenderer dragon;
public ModelRenderer squirrel;
public ModelRenderer horse;
public ModelRenderer fin;
public ModelRenderer rodent;
public ModelRenderer feather;
public ModelCanineTail fox;
public ModelMonkeyTail monkey;
private int color = 0xFFFFFF;