Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
175 commits
Select commit Hold shift + click to select a range
acf743c
Updated to 1.6.4
lclc98 Sep 27, 2013
2bc8c80
Merge pull request #1 from lclc98/master
odininon Sep 27, 2013
ebcf0f1
Update build.xml
odininon Sep 27, 2013
d837875
Fixed crash
lclc98 Sep 27, 2013
83e8ab1
Merge pull request #2 from lclc98/master
odininon Sep 27, 2013
5d18aed
Started Rewrite
lclc98 Jan 22, 2014
f34d0d2
Added WorldGen
lclc98 Jan 23, 2014
494ff62
Finished Rewrite
lclc98 Feb 2, 2014
879f677
Fixed Bugs
lclc98 Feb 2, 2014
41052a7
Fixed Bugs
lclc98 Feb 2, 2014
3069bce
Fixed More Issues
lclc98 Feb 3, 2014
f8214e2
Fixed Burning Trap name
lclc98 Feb 3, 2014
31b08c6
Fixed Mob Names
lclc98 Feb 3, 2014
71afae3
Added in Enchant Effect
lclc98 Feb 3, 2014
0c12246
Fixed knockback
lclc98 Feb 3, 2014
b02b9c5
Fixed wolf texture
lclc98 Feb 3, 2014
9785d1b
FIxed Server Crashes
lclc98 Feb 4, 2014
4199641
Fixed Nuts call bugs
lclc98 Feb 4, 2014
f672797
Fixed Portal
lclc98 Feb 4, 2014
5e0f100
Fixed Texture Problems
lclc98 Feb 5, 2014
125edbf
Started Updating to 1.7.2
lclc98 Feb 9, 2014
35b0864
Reverted Commit
lclc98 Feb 12, 2014
dc2d1a1
Fixed Issues
lclc98 Feb 12, 2014
ca2087e
Testing
lclc98 Feb 13, 2014
24804d1
Merge pull request #3 from lclc98/master
odininon Feb 14, 2014
750e8bb
Fixed Logs
lclc98 Feb 15, 2014
d476f66
Fixed Broken Bow Render
lclc98 Feb 19, 2014
caf62d8
Fixed Breaking Portal
lclc98 Feb 19, 2014
2f72a86
Fixed Speed Issues
lclc98 Feb 23, 2014
ddc213a
Fixed AI
lclc98 Feb 23, 2014
405ed49
Fixed Shrub texture
lclc98 Feb 23, 2014
06a4785
Fixed Cursed Chest trying to spawn mobs in peaceful mod
lclc98 Mar 6, 2014
70f3de0
Fixed Furnace Bug
lclc98 Mar 9, 2014
4810594
Fixed Bug with non breakable block
lclc98 Mar 9, 2014
8dcfd0a
Fixed bug crash with nei
lclc98 Mar 13, 2014
ea039c3
Removed Spear
lclc98 Mar 13, 2014
fe56d86
Fixed Ptahs Decadence Bug
lclc98 Mar 14, 2014
3217f9d
Fixed Build script
lclc98 Mar 15, 2014
c5115a2
Fixed Formatting
lclc98 Mar 15, 2014
5478640
Switched to inbuild language translation
lclc98 Mar 18, 2014
c3599d1
Fixed worldgen
lclc98 Mar 18, 2014
e36519c
Re-enabled structures
lclc98 Mar 18, 2014
be88833
Fixed typo
lclc98 Mar 21, 2014
5e7123b
Fixed npe
lclc98 Mar 26, 2014
1a72c8e
Not a secret 1.7 update :P
lclc98 Jun 3, 2014
3ba10f5
Fixed Pyramid Generation
lclc98 Jun 5, 2014
6ad79eb
Fixed Entity Textures
lclc98 Jun 5, 2014
fa33343
Fixed Worldgen
lclc98 Jun 5, 2014
adbf2bd
Fixed Fog
lclc98 Jun 5, 2014
03b0222
Fixed version
lclc98 Jun 5, 2014
f5c8e98
Fixed Portal Generation
lclc98 Jun 7, 2014
fc9696f
Fixed console spam and other bugs
lclc98 Jun 8, 2014
b4d004c
Fixed Render Bug
lclc98 Jun 8, 2014
20203b0
Fixed missing textures for date and shrub
Glassmaker Jun 8, 2014
83637d2
Create ru_RU.lang
Jun 11, 2014
7884819
Fixed localization for loot Closes #6
lclc98 Jun 12, 2014
83328ae
Merge branch 'master' of https://github.com/TeamMetallurgy/Atum
lclc98 Jun 12, 2014
a3d47b9
Merge pull request #5 from Adaptivity/patch-1
lclc98 Jun 12, 2014
0ae16c6
Update ru_RU.lang
Jun 12, 2014
5c68cd2
Merge pull request #7 from Adaptivity/patch-1
lclc98 Jun 12, 2014
b87df70
Now you can disable portal creation Closes #4
lclc98 Jun 13, 2014
39eab8d
Merge branch 'master' of https://github.com/TeamMetallurgy/Atum
lclc98 Jun 13, 2014
64d30f1
Update en_US.lang
Jun 13, 2014
a1faef3
Merge pull request #10 from Adaptivity/patch-1
lclc98 Jun 13, 2014
e820ce8
Added more localization Closes #8 and #9
lclc98 Jun 14, 2014
d8b231d
Fixed pharoah chat msg, Close #11
lclc98 Jul 6, 2014
2f76b38
Removed import
lclc98 Jul 6, 2014
c5d3aa2
Updated to 1.7.10
lclc98 Jul 10, 2014
31560ad
Fixed textures
lclc98 Jul 16, 2014
18d5bbc
Refactored code
lclc98 Jul 29, 2014
24dcc96
Fixed Crashes
lclc98 Jul 29, 2014
84daf0d
Changed block
lclc98 Jul 29, 2014
2d114fb
Bumped Version
lclc98 Aug 5, 2014
acd14ad
Reformatted code
lclc98 Sep 24, 2014
ae44449
Removes System.out
Glassmaker Sep 25, 2014
9554f09
Changes the logger to log4j
Glassmaker Sep 25, 2014
dc94b10
Fixes the fog
Glassmaker Sep 25, 2014
5e4718b
Fixes Date tileEntity crash
Glassmaker Oct 5, 2014
e7a8198
Fixes warnings about registrating entities
Glassmaker Oct 5, 2014
737ac61
Fixes unlocalized message of opening the spawner chest near enemies
Glassmaker Oct 5, 2014
3420602
Fixes entity names
Glassmaker Oct 5, 2014
3b816a9
Adds automated version numbering and mcmod.info, closes #15
Glassmaker Oct 7, 2014
7cff25b
Reverts the internal mod name to just Atum
Glassmaker Oct 7, 2014
1d9c491
Added Config Gui
lclc98 Oct 12, 2014
8699a91
Moved Classes
lclc98 Oct 12, 2014
20002d7
Update ru_RU.lang
Oct 12, 2014
c4b268d
Update en_US.lang
Oct 12, 2014
890c693
Merge pull request #17 from Adaptivity/patch-1
lclc98 Oct 12, 2014
28877cb
Added lang for config and fixed sound for atum stone, Closes #18 and #16
lclc98 Oct 14, 2014
b285269
Fixed lang from git derp
lclc98 Oct 14, 2014
1bf752d
Update ru_RU.lang
Oct 14, 2014
90dfeea
Merge pull request #19 from Adaptivity/patch-1
lclc98 Oct 14, 2014
1f8df81
Create zh_CN.lang
sb023612 Oct 14, 2014
a6a7fdc
Merge pull request #20 from sb023612/master
lclc98 Oct 14, 2014
7dc2284
Fixed Dependency
lclc98 Oct 15, 2014
876ed63
Fix portal position, Closes #13 Thanks @Glassmaker
lclc98 Oct 16, 2014
7f08ca3
Fixed movement
lclc98 Dec 4, 2014
41d1760
Refactored the portal code
lclc98 Jan 7, 2015
a990f10
Create pt_BR.lang
alab434 Jan 20, 2015
5f3512f
Merge pull request #23 from al-myr/patch-1
Glassmaker Jan 21, 2015
b642242
Updates .gitattributes
Glassmaker Feb 27, 2015
8c5338a
Updates gradle wrapper to 2.0
Glassmaker Feb 27, 2015
cfdbbeb
Updates forge to 1291
Glassmaker Feb 27, 2015
388f66d
Switching logger to preinit event logger
Glassmaker Feb 27, 2015
a381ce8
Switches non important log messages to trace, reducing console spam
Glassmaker Feb 27, 2015
97fcbb6
Adds individual loot localization support, closes #25
Glassmaker Feb 27, 2015
2dcb0dd
Update ru_RU.lang
Feb 27, 2015
351a1d2
Merge pull request #26 from Adaptivity/master
Glassmaker Feb 27, 2015
366e524
Fixes arrows hitting thrower
Glassmaker Feb 28, 2015
2a00a5f
Fixes palm tree generation, closes #24
Glassmaker Feb 28, 2015
213e0aa
Fixes palace generation
Glassmaker Feb 28, 2015
071edb0
Adjusts spawning rates of buildings
Glassmaker Mar 1, 2015
40c0c0a
Fixes placing Papyrus on Fertile soil
Glassmaker Mar 1, 2015
6b5b3f5
Fixes feritile soil pickup in creative
Glassmaker Mar 1, 2015
72d4ae1
Fixes Flax plants generation in Oases
Glassmaker Mar 1, 2015
42229c4
Fixes Glass breaking sound
Glassmaker Mar 1, 2015
1f58d61
Adds ores and glass to the OreDictionary
Glassmaker Mar 1, 2015
aa954cb
Moved README.md, added pack.mcmeta, fixes for .lang files
Mar 1, 2015
bb7cb7c
Adds Stained glass
Glassmaker Mar 1, 2015
2f68013
Merge pull request #29 from Adaptivity/master
Glassmaker Mar 1, 2015
548b56e
Adds Localization for stained glass
Glassmaker Mar 2, 2015
eab5929
Moves registeration of blocks with custom item classes
Glassmaker Mar 2, 2015
7270d09
Adds OreDictionary support
Glassmaker Mar 2, 2015
adc5cd6
Fix
fewizz Mar 4, 2015
096d6f9
Merge pull request #31 from fewizz/patch-1
Glassmaker Mar 4, 2015
68c6c05
Adds NEI as a dep
Glassmaker Mar 4, 2015
af9fdbd
Hides extra blocks from creative and NEI, closes #28
Glassmaker Mar 4, 2015
0634ba1
Fixes wrong effect in Anhurs Might, releated to #27
Glassmaker Mar 4, 2015
32c443d
Fixes Horus Soaring's tooltip localization, closes #27
Glassmaker Mar 4, 2015
6900a95
Update ru_RU.lang
Mar 4, 2015
72635a3
Fixes displaying mummy helment's overlay
Glassmaker Mar 4, 2015
27b52f5
Fixes rod crash
Glassmaker Mar 4, 2015
7d762e8
Merge pull request #32 from Adaptivity/master
Glassmaker Mar 4, 2015
6ad1808
Adds hardness to dates, closes #33
Glassmaker Mar 4, 2015
f1b7cc7
Adds recipes for Stained Glass
Glassmaker Mar 5, 2015
8439fa4
Removes Crystal glass from blackGlassColorless oredic
Glassmaker Mar 5, 2015
a1ab184
Fixes server side crash when spawning the Pharoh, close #41
Glassmaker Mar 8, 2015
c497c94
Fixes Atum's Desert biome name, related to #39
Glassmaker Mar 8, 2015
c70de1f
Bumps palace rarity to 1 in 1000, closes #39
Glassmaker Mar 9, 2015
68a925e
Moves item and block registeration to pre-init, closes #45
Glassmaker Mar 19, 2015
910168a
Adds Limestone large bricks types, closes #42
Glassmaker Apr 22, 2015
d5fdbc2
Adds default resistance
Glassmaker Apr 22, 2015
d82a9cd
Changes Pyramid's large bricks to generate with meta of 0
Glassmaker Apr 22, 2015
e6620b8
Fixes Desert wolves sounds, closes #43
Glassmaker Apr 22, 2015
c2f0dbf
Fixes crash when Isis healing is used in non-standard inventory, clos…
Glassmaker Sep 5, 2015
f6d9b9b
Removes stacking effect with isis healing
Glassmaker Sep 6, 2015
f2471c2
Fixes armor slot detection in Horus flight, and Sekhmets Warth
Glassmaker Sep 7, 2015
7aeebff
Fixes armor effects, closes #47
Glassmaker Sep 7, 2015
72c8bda
Enhances preformance by checking if the world is remote first
Glassmaker Sep 8, 2015
8927256
Updates forge to 1448
Glassmaker Sep 8, 2015
344068f
Fixes Mafdets' Quickness effect
Glassmaker Sep 8, 2015
a22bbb4
Fixes Limestone furnace
Glassmaker Sep 8, 2015
237b861
Localizes the remaining of the tooltips, closes #37
Glassmaker Sep 8, 2015
93dadea
Update ru_RU.lang
Sep 8, 2015
274ee24
Fixes chests
Glassmaker Sep 8, 2015
57e4508
Merge pull request #49 from Adaptivity/patch-1
Glassmaker Sep 8, 2015
b70cf06
Adds breakable large brick stairs
Glassmaker Sep 8, 2015
4559ec1
Fixes Limestone's name
Glassmaker Sep 8, 2015
9659d3c
Fixes Flax not growing
Glassmaker Sep 9, 2015
22e7d1b
Fixes Gebs' Solidarity slowness, closes #36
Glassmaker Sep 9, 2015
708f745
Adds sanity checks to Gebs' Solidarity effect
Glassmaker Sep 9, 2015
90bf84f
Fixes projectiles entity rendering
Glassmaker Sep 9, 2015
13dadce
Replaces entity registration Global IDs with Mod IDs only
Glassmaker Sep 9, 2015
1833cae
Adds config for disabling Oases
Glassmaker Sep 29, 2015
452d21c
Fixed that Palm Logs didn't trigger the achievement "Getting Wood"
GirafiStudios Oct 7, 2015
90f4334
Fixed that Fertile Soil turns into dirt when jumped on
GirafiStudios Oct 7, 2015
4c9064b
Made the Ghost immune to fire.
GirafiStudios Oct 7, 2015
46d96b9
Merge pull request #50 from GirafiStudios/master
Glassmaker Oct 7, 2015
7e9ce3a
Fixed Possessive Names
Shadowclaimer Oct 19, 2015
206ed0f
Changed Desert Ghost to Wraith
Shadowclaimer Oct 19, 2015
9599515
Uncapitalized Pharaoh Suffix Names
Shadowclaimer Oct 19, 2015
4891b38
Fixed hardness and resistance of Smooth Limestone
Shadowclaimer Oct 20, 2015
487703c
Fixed Redstone Hardness
Shadowclaimer Oct 20, 2015
efbeeb9
Forgot semicolon because I'm a dummy.
Shadowclaimer Oct 20, 2015
85231cd
Update en_US.lang
Shadowclaimer Oct 20, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 9 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
* text eol=lf
*.jar binary
*.png binary
*.xcf binary
*.ogg binary
*.java text eol=lf
mcmod.info text eol=lf
*.sh text eol=lf
*.bat text eol=crlf
235 changes: 235 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,235 @@
#################
## Eclipse
#################

*.pydevproject
.project
.metadata
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.classpath
.settings/
.loadpath

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# CDT-specific
.cproject

# PDT-specific
.buildpath

#################
## Intellij Idea
#################
/out/
*.iml
*.ipr
*.iws

#################
## Visual Studio
#################

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.sln.docstates

# Build results

[Dd]ebug/
[Rr]elease/
x64/
build/
[Bb]in/
[Oo]bj/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.log
*.scc

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
*.cachefile

# Visual Studio profiler
*.psess
*.vsp
*.vspx

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
*.ncrunch*
.*crunch*.local.xml

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.Publish.xml
*.pubxml

# NuGet Packages Directory
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
#packages/

# Windows Azure Build Output
csx
*.build.csdef

# Windows Store app package directory
AppPackages/

# Others
sql/
*.Cache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.[Pp]ublish.xml
*.pfx
*.publishsettings

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
App_Data/*.mdf
App_Data/*.ldf

#############
## Windows detritus
#############

# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Mac crap
.DS_Store


#############
## Python
#############

*.py[co]

# Packages
*.egg
*.egg-info
dist/
build/
eggs/
parts/
var/
sdist/
develop-eggs/
.installed.cfg

# Installer logs
pip-log.txt

# Unit test / coverage reports
.coverage
.tox

#Translations
*.mo

#Mr Developer
.mr.developer.cfg

#############
## ForgeGradle
#############
.gradle/
build/
run/
eclipse/
CREDITS-fml.txt
forge-*-*-changelog.txt
LICENSE-fml.txt
MinecraftForge-Credits.txt
MinecraftForge-License.txt
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#[Atum](http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1288464-atum-journey-into-the-sands)

Adds a new desert dimension that contains an eternal world full of sand, temples, and tons of new foes. Journey into Atum and discover ancient artifacts as you battle your way through vicious new enemies!
118 changes: 118 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
buildscript {
repositories {
mavenCentral()
mavenLocal()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
maven {
name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/"
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
}
}

repositories {
maven {
name = "Team Metallurgy Maven"
url = "http://mc.aesireanempire.com/maven"
}

maven {
name = "ChickenBones"
url = "http://chickenbones.net/maven"
}
}

apply plugin: 'forge'

version = "0.6"
group= "com.teammetallurgy.atum" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "Atum"

ext.configFile = file "build.properties"

configFile.withReader {
def prop = new Properties()
prop.load(it)
project.ext.config = new ConfigSlurper().parse prop
}

minecraft {
version = config.minecraft_version + "-" + config.forge_version
}

dependencies {
compile "codechicken:CodeChickenLib:${config.minecraft_version}-${config.cclib_version}:dev"
compile "codechicken:CodeChickenCore:${config.minecraft_version}-${config.ccc_version}:dev"
compile "codechicken:NotEnoughItems:${config.minecraft_version}-${config.nei_version}:dev"
}

task buildInfo() {
def cmd = "git rev-parse --short HEAD"
def proc = cmd.execute()
proc.waitFor()
if (proc.exitValue() == 0) {
ext.revision = "DEV." + proc.text.trim()
} else {
ext.revision = "GITBORK"
}

if (System.getenv().BUILD_NUMBER != null) {
ext.buildNum = "${System.getenv().BUILD_NUMBER}"
} else {
ext.buildNum = "${project.buildInfo.revision}"
}
}

ext.artifact_version = 'NFG'
if (System.getenv().ARTIFACT_VERSION == null) {
artifact_version = "${config.mod_version}.${project.buildInfo.buildNum}"
}

if(System.getenv().ARTIFACT_VERSION != null) {
artifact_version = "${system.getenv().ARTIFACT_VERSION}"
}

version = "${config.minecraft_version}-${artifact_version}"

processResources
{
// this will ensure that this task is redone when the versions change.
inputs.property "version", project.artifact_version
inputs.property "mcversion", project.minecraft.version

// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'

// replace version and mcversion
expand 'version':project.artifact_version, 'mcversion':project.minecraft.version
}

// copy everything else, thats not the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
}

task deobfJar(type: Jar) {
from sourceSets.main.output
classifier = 'deobf'
}

artifacts {
archives deobfJar
}

uploadArchives {
repositories {
mavenDeployer {
repository(url : "file:///var/www/html/maven")
}
}
}
6 changes: 6 additions & 0 deletions build.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
minecraft_version=1.7.10
forge_version=10.13.4.1448-1.7.10
mod_version=0.6
cclib_version=1.1.1.99
ccc_version=1.0.4.29
nei_version=1.0.3.74
Loading